diff options
Diffstat (limited to 'src/glibext')
| -rw-r--r-- | src/glibext/gbinportion.c | 6 | ||||
| -rw-r--r-- | src/glibext/gbuffercache.c | 4 | ||||
| -rw-r--r-- | src/glibext/generators/hex.c | 6 | ||||
| -rw-r--r-- | src/glibext/generators/prologue.c | 6 | ||||
| -rw-r--r-- | src/glibext/generators/rborder.c | 6 | ||||
| -rw-r--r-- | src/glibext/linegen-int.h | 4 | ||||
| -rw-r--r-- | src/glibext/linegen.c | 4 | ||||
| -rw-r--r-- | src/glibext/linegen.h | 2 | 
8 files changed, 19 insertions, 19 deletions
| diff --git a/src/glibext/gbinportion.c b/src/glibext/gbinportion.c index c4c13fc..44053f9 100644 --- a/src/glibext/gbinportion.c +++ b/src/glibext/gbinportion.c @@ -76,7 +76,7 @@ static size_t g_binary_portion_count_lines(const GBinPortion *);  static void g_binary_portion_compute_cursor(const GBinPortion *, gint, size_t, size_t, GLineCursor **);  /* Détermine si le conteneur s'inscrit dans une plage donnée. */ -static int g_binary_portion_contains_cursor(const GBinPortion *, size_t, size_t, const GLineCursor *); +static int g_binary_portion_contain_cursor(const GBinPortion *, size_t, size_t, const GLineCursor *);  /* Renseigne sur les propriétés liées à un générateur. */  static BufferLineFlags g_binary_portion_get_flags(const GBinPortion *, size_t, size_t); @@ -181,7 +181,7 @@ static void g_binary_portion_interface_init(GLineGeneratorInterface *iface)  {      iface->count = (linegen_count_lines_fc)g_binary_portion_count_lines;      iface->compute = (linegen_compute_fc)g_binary_portion_compute_cursor; -    iface->contains = (linegen_contains_fc)g_binary_portion_contains_cursor; +    iface->contain = (linegen_contain_fc)g_binary_portion_contain_cursor;      iface->get_flags = (linegen_get_flags_fc)g_binary_portion_get_flags;      iface->print = (linegen_print_fc)g_binary_portion_print; @@ -1064,7 +1064,7 @@ static void g_binary_portion_compute_cursor(const GBinPortion *portion, gint x,  *                                                                             *  ******************************************************************************/ -static int g_binary_portion_contains_cursor(const GBinPortion *portion, size_t index, size_t repeat, const GLineCursor *cursor) +static int g_binary_portion_contain_cursor(const GBinPortion *portion, size_t index, size_t repeat, const GLineCursor *cursor)  {      int result;                             /* Conclusion à retourner      */      vmpa2t addr;                            /* Autre emplacement à comparer*/ diff --git a/src/glibext/gbuffercache.c b/src/glibext/gbuffercache.c index d918a5d..b54de26 100644 --- a/src/glibext/gbuffercache.c +++ b/src/glibext/gbuffercache.c @@ -1530,7 +1530,7 @@ size_t _g_buffer_cache_find_index_by_cursor(const GBufferCache *cache, const GLi          else              generator = &i->generators[0]; -        return g_line_generator_contains_cursor(generator->instance, +        return g_line_generator_contain_cursor(generator->instance,                                                  i - cache->lines, generator->repeat, c);      } @@ -1711,7 +1711,7 @@ bool g_buffer_cache_get_cursor_coordinates(const GBufferCache *cache, const GLin              else                  generator = &info->generators[0]; -            if (!g_line_generator_contains_cursor(generator->instance, index + 1, generator->repeat, cursor)) +            if (!g_line_generator_contain_cursor(generator->instance, index + 1, generator->repeat, cursor))                  break;              *y += lheight; diff --git a/src/glibext/generators/hex.c b/src/glibext/generators/hex.c index ab473b1..13a76e3 100644 --- a/src/glibext/generators/hex.c +++ b/src/glibext/generators/hex.c @@ -84,7 +84,7 @@ static size_t g_hex_generator_count_lines(const GHexGenerator *);  static void g_hex_generator_compute_cursor(const GHexGenerator *, gint, size_t, size_t, GLineCursor **);  /* Détermine si le conteneur s'inscrit dans une plage donnée. */ -static int g_hex_generator_contains_cursor(const GHexGenerator *, size_t, size_t, const GLineCursor *); +static int g_hex_generator_contain_cursor(const GHexGenerator *, size_t, size_t, const GLineCursor *);  /* Renseigne sur les propriétés liées à un générateur. */  static BufferLineFlags g_hex_generator_get_flags(const GHexGenerator *, size_t, size_t); @@ -185,7 +185,7 @@ static void g_hex_generator_interface_init(GLineGeneratorInterface *iface)  {      iface->count = (linegen_count_lines_fc)g_hex_generator_count_lines;      iface->compute = (linegen_compute_fc)g_hex_generator_compute_cursor; -    iface->contains = (linegen_contains_fc)g_hex_generator_contains_cursor; +    iface->contain = (linegen_contain_fc)g_hex_generator_contain_cursor;      iface->get_flags = (linegen_get_flags_fc)g_hex_generator_get_flags;      iface->print = (linegen_print_fc)g_hex_generator_print; @@ -377,7 +377,7 @@ static void g_hex_generator_compute_cursor(const GHexGenerator *generator, gint  *                                                                             *  ******************************************************************************/ -static int g_hex_generator_contains_cursor(const GHexGenerator *generator, size_t index, size_t repeat, const GLineCursor *cursor) +static int g_hex_generator_contain_cursor(const GHexGenerator *generator, size_t index, size_t repeat, const GLineCursor *cursor)  {      int result;                             /* Bilan d'étude à renvoyer    */      vmpa2t addr;                            /* Autre emplacement à comparer*/ diff --git a/src/glibext/generators/prologue.c b/src/glibext/generators/prologue.c index 9801bcd..3295e73 100644 --- a/src/glibext/generators/prologue.c +++ b/src/glibext/generators/prologue.c @@ -78,7 +78,7 @@ static size_t g_intro_generator_count_lines(const GIntroGenerator *);  static void g_intro_generator_compute_cursor(const GIntroGenerator *, gint, size_t, size_t, GLineCursor **);  /* Détermine si le conteneur s'inscrit dans une plage donnée. */ -static int g_intro_generator_contains_cursor(const GIntroGenerator *, size_t, size_t, const GLineCursor *); +static int g_intro_generator_contain_cursor(const GIntroGenerator *, size_t, size_t, const GLineCursor *);  /* Renseigne sur les propriétés liées à un générateur. */  static BufferLineFlags g_intro_generator_get_flags(const GIntroGenerator *, size_t, size_t); @@ -153,7 +153,7 @@ static void g_intro_generator_interface_init(GLineGeneratorInterface *iface)  {      iface->count = (linegen_count_lines_fc)g_intro_generator_count_lines;      iface->compute = (linegen_compute_fc)g_intro_generator_compute_cursor; -    iface->contains = (linegen_contains_fc)g_intro_generator_contains_cursor; +    iface->contain = (linegen_contain_fc)g_intro_generator_contain_cursor;      iface->get_flags = (linegen_get_flags_fc)g_intro_generator_get_flags;      iface->print = (linegen_print_fc)g_intro_generator_print; @@ -321,7 +321,7 @@ static void g_intro_generator_compute_cursor(const GIntroGenerator *generator, g  *                                                                             *  ******************************************************************************/ -static int g_intro_generator_contains_cursor(const GIntroGenerator *generator, size_t index, size_t repeat, const GLineCursor *cursor) +static int g_intro_generator_contain_cursor(const GIntroGenerator *generator, size_t index, size_t repeat, const GLineCursor *cursor)  {      int result;                             /* Conclusion à retourner      */      vmpa2t addr;                            /* Autre emplacement à comparer*/ diff --git a/src/glibext/generators/rborder.c b/src/glibext/generators/rborder.c index 1764f88..8509376 100644 --- a/src/glibext/generators/rborder.c +++ b/src/glibext/generators/rborder.c @@ -85,7 +85,7 @@ static size_t g_border_generator_count_lines(const GBorderGenerator *);  static void g_border_generator_compute_cursor(const GBorderGenerator *, gint, size_t, size_t, GLineCursor **);  /* Détermine si le conteneur s'inscrit dans une plage donnée. */ -static int g_border_generator_contains_cursor(const GBorderGenerator *, size_t, size_t, const GLineCursor *); +static int g_border_generator_contain_cursor(const GBorderGenerator *, size_t, size_t, const GLineCursor *);  /* Renseigne sur les propriétés liées à un générateur. */  static BufferLineFlags g_border_generator_get_flags(const GBorderGenerator *, size_t, size_t); @@ -158,7 +158,7 @@ static void g_border_generator_interface_init(GLineGeneratorInterface *iface)  {      iface->count = (linegen_count_lines_fc)g_border_generator_count_lines;      iface->compute = (linegen_compute_fc)g_border_generator_compute_cursor; -    iface->contains = (linegen_contains_fc)g_border_generator_contains_cursor; +    iface->contain = (linegen_contain_fc)g_border_generator_contain_cursor;      iface->get_flags = (linegen_get_flags_fc)g_border_generator_get_flags;      iface->print = (linegen_print_fc)g_border_generator_print; @@ -298,7 +298,7 @@ void g_border_generator_compute_cursor(const GBorderGenerator *generator, gint x  *                                                                             *  ******************************************************************************/ -static int g_border_generator_contains_cursor(const GBorderGenerator *generator, size_t index, size_t repeat, const GLineCursor *cursor) +static int g_border_generator_contain_cursor(const GBorderGenerator *generator, size_t index, size_t repeat, const GLineCursor *cursor)  {      int result;                             /* Conclusion à retourner      */      vmpa2t addr;                            /* Autre emplacement à comparer*/ diff --git a/src/glibext/linegen-int.h b/src/glibext/linegen-int.h index a060e2f..6952f69 100644 --- a/src/glibext/linegen-int.h +++ b/src/glibext/linegen-int.h @@ -36,7 +36,7 @@ typedef size_t (* linegen_count_lines_fc) (const GLineGenerator *);  typedef void (* linegen_compute_fc) (const GLineGenerator *, gint, size_t, size_t, GLineCursor **);  /* Détermine si le conteneur s'inscrit dans une plage donnée. */ -typedef int (* linegen_contains_fc) (const GLineGenerator *, size_t, size_t, const GLineCursor *); +typedef int (* linegen_contain_fc) (const GLineGenerator *, size_t, size_t, const GLineCursor *);  /* Renseigne sur les propriétés liées à un générateur. */  typedef BufferLineFlags (* linegen_get_flags_fc) (const GLineGenerator *, size_t, size_t); @@ -52,7 +52,7 @@ struct _GLineGeneratorIface      linegen_count_lines_fc count;           /* Décompte des lignes         */      linegen_compute_fc compute;             /* Calcul d'emplacement        */ -    linegen_contains_fc contains;           /* Inclusion de positions      */ +    linegen_contain_fc contain;             /* Inclusion de positions      */      linegen_get_flags_fc get_flags;         /* Récupération des drapeaux   */      linegen_print_fc print;                 /* Impression d'une ligne      */ diff --git a/src/glibext/linegen.c b/src/glibext/linegen.c index 42915ee..c5291ab 100644 --- a/src/glibext/linegen.c +++ b/src/glibext/linegen.c @@ -133,7 +133,7 @@ GLineCursor *g_line_generator_compute_cursor(const GLineGenerator *generator, gi  *                                                                             *  ******************************************************************************/ -int g_line_generator_contains_cursor(const GLineGenerator *generator, size_t index, size_t repeat, const GLineCursor *cursor) +int g_line_generator_contain_cursor(const GLineGenerator *generator, size_t index, size_t repeat, const GLineCursor *cursor)  {      int result;                             /* Bilan d'analyse à retourner */      GLineGeneratorIface *iface;             /* Interface utilisée          */ @@ -145,7 +145,7 @@ int g_line_generator_contains_cursor(const GLineGenerator *generator, size_t ind          assert(repeat < g_line_generator_count_lines(generator));  #endif -    result = iface->contains(generator, index, repeat, cursor); +    result = iface->contain(generator, index, repeat, cursor);      return result; diff --git a/src/glibext/linegen.h b/src/glibext/linegen.h index 967e95e..74a889a 100644 --- a/src/glibext/linegen.h +++ b/src/glibext/linegen.h @@ -59,7 +59,7 @@ size_t g_line_generator_count_lines(const GLineGenerator *);  GLineCursor *g_line_generator_compute_cursor(const GLineGenerator *, gint, size_t, size_t);  /* Détermine si le conteneur s'inscrit dans une plage donnée. */ -int g_line_generator_contains_cursor(const GLineGenerator *, size_t, size_t, const GLineCursor *); +int g_line_generator_contain_cursor(const GLineGenerator *, size_t, size_t, const GLineCursor *);  /* Renseigne sur les propriétés liées à un générateur. */  BufferLineFlags g_line_generator_get_flags(const GLineGenerator *, size_t, size_t); | 
