summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/pychrysalide/glibext/linegen.c4
-rw-r--r--src/analysis/db/items/comment.c6
-rw-r--r--src/arch/instruction.c6
-rw-r--r--src/format/symbol.c6
-rw-r--r--src/glibext/gbinportion.c6
-rw-r--r--src/glibext/gbuffercache.c4
-rw-r--r--src/glibext/generators/hex.c6
-rw-r--r--src/glibext/generators/prologue.c6
-rw-r--r--src/glibext/generators/rborder.c6
-rw-r--r--src/glibext/linegen-int.h4
-rw-r--r--src/glibext/linegen.c4
-rw-r--r--src/glibext/linegen.h2
-rw-r--r--src/gtkext/gtkbufferdisplay.c2
-rw-r--r--src/gtkext/gtkbufferdisplay.h2
-rw-r--r--src/gtkext/gtkgraphdisplay.c2
15 files changed, 33 insertions, 33 deletions
diff --git a/plugins/pychrysalide/glibext/linegen.c b/plugins/pychrysalide/glibext/linegen.c
index 1ab4ec6..d7e96fd 100644
--- a/plugins/pychrysalide/glibext/linegen.c
+++ b/plugins/pychrysalide/glibext/linegen.c
@@ -123,7 +123,7 @@ static void py_line_generator_interface_init(GLineGeneratorIface *iface, gpointe
iface->count = py_line_generator_count_lines_wrapper;
iface->compute = py_line_generator_compute_cursor_wrapper;
- iface->contains = py_line_generator_contain_cursor_wrapper;
+ iface->contain = py_line_generator_contain_cursor_wrapper;
iface->get_flags = py_line_generator_get_flags_wrapper;
iface->print = py_line_generator_print_wrapper;
@@ -599,7 +599,7 @@ static PyObject *py_line_generator_contain_cursor(PyObject *self, PyObject *args
generator = G_LINE_GENERATOR(pygobject_get(self));
- status = g_line_generator_contains_cursor(generator, index, repeat, cursor);
+ status = g_line_generator_contain_cursor(generator, index, repeat, cursor);
result = PyLong_FromLong(status);
diff --git a/src/analysis/db/items/comment.c b/src/analysis/db/items/comment.c
index 6c1f6d9..a4a62b0 100644
--- a/src/analysis/db/items/comment.c
+++ b/src/analysis/db/items/comment.c
@@ -137,7 +137,7 @@ static size_t g_db_comment_count_lines(const GDbComment *);
static void g_db_comment_compute_cursor(const GDbComment *, gint, size_t, size_t, GLineCursor **);
/* Détermine si le conteneur s'inscrit dans une plage donnée. */
-static int g_db_comment_contains_cursor(const GDbComment *, size_t, size_t, const GLineCursor *);
+static int g_db_comment_contain_cursor(const GDbComment *, size_t, size_t, const GLineCursor *);
/* Renseigne sur les propriétés liées à un générateur. */
static BufferLineFlags g_db_comment_get_flags(const GDbComment *, size_t, size_t);
@@ -272,7 +272,7 @@ static void g_db_comment_interface_init(GLineGeneratorInterface *iface)
{
iface->count = (linegen_count_lines_fc)g_db_comment_count_lines;
iface->compute = (linegen_compute_fc)g_db_comment_compute_cursor;
- iface->contains = (linegen_contains_fc)g_db_comment_contains_cursor;
+ iface->contain = (linegen_contain_fc)g_db_comment_contain_cursor;
iface->get_flags = (linegen_get_flags_fc)g_db_comment_get_flags;
iface->print = (linegen_print_fc)g_db_comment_print;
@@ -1382,7 +1382,7 @@ static void g_db_comment_compute_cursor(const GDbComment *comment, gint x, size_
* *
******************************************************************************/
-static int g_db_comment_contains_cursor(const GDbComment *comment, size_t index, size_t repeat, const GLineCursor *cursor)
+static int g_db_comment_contain_cursor(const GDbComment *comment, size_t index, size_t repeat, const GLineCursor *cursor)
{
int result; /* Conclusion à retourner */
vmpa2t addr; /* Autre emplacement à comparer*/
diff --git a/src/arch/instruction.c b/src/arch/instruction.c
index b2f1137..6bc158f 100644
--- a/src/arch/instruction.c
+++ b/src/arch/instruction.c
@@ -75,7 +75,7 @@ static size_t g_arch_instruction_count_lines(const GArchInstruction *);
static void g_arch_instruction_compute_cursor(const GArchInstruction *, gint, size_t, size_t, GLineCursor **);
/* Détermine si le conteneur s'inscrit dans une plage donnée. */
-static int g_arch_instruction_contains_cursor(const GArchInstruction *, size_t, size_t, const GLineCursor *);
+static int g_arch_instruction_contain_cursor(const GArchInstruction *, size_t, size_t, const GLineCursor *);
/* Renseigne sur les propriétés liées à un générateur. */
static BufferLineFlags g_arch_instruction_get_flags2(const GArchInstruction *, size_t, size_t);
@@ -165,7 +165,7 @@ static void g_arch_instruction_generator_interface_init(GLineGeneratorInterface
{
iface->count = (linegen_count_lines_fc)g_arch_instruction_count_lines;
iface->compute = (linegen_compute_fc)g_arch_instruction_compute_cursor;
- iface->contains = (linegen_contains_fc)g_arch_instruction_contains_cursor;
+ iface->contain = (linegen_contain_fc)g_arch_instruction_contain_cursor;
iface->get_flags = (linegen_get_flags_fc)g_arch_instruction_get_flags2;
iface->print = (linegen_print_fc)g_arch_instruction_print;
@@ -1901,7 +1901,7 @@ static void g_arch_instruction_compute_cursor(const GArchInstruction *instr, gin
* *
******************************************************************************/
-static int g_arch_instruction_contains_cursor(const GArchInstruction *instr, size_t index, size_t repeat, const GLineCursor *cursor)
+static int g_arch_instruction_contain_cursor(const GArchInstruction *instr, size_t index, size_t repeat, const GLineCursor *cursor)
{
int result; /* Conclusion à retourner */
vmpa2t addr; /* Autre emplacement à comparer*/
diff --git a/src/format/symbol.c b/src/format/symbol.c
index abf284e..d2faf7c 100644
--- a/src/format/symbol.c
+++ b/src/format/symbol.c
@@ -65,7 +65,7 @@ static size_t g_binary_symbol_count_lines(const GBinSymbol *);
static void g_binary_symbol_compute_cursor(const GBinSymbol *, gint, size_t, size_t, GLineCursor **);
/* Détermine si le conteneur s'inscrit dans une plage donnée. */
-static int g_binary_symbol_contains_cursor(const GBinSymbol *, size_t, size_t, const GLineCursor *);
+static int g_binary_symbol_contain_cursor(const GBinSymbol *, size_t, size_t, const GLineCursor *);
/* Renseigne sur les propriétés liées à un générateur. */
static BufferLineFlags g_binary_symbol_get_line_flags(const GBinSymbol *, size_t, size_t);
@@ -148,7 +148,7 @@ static void g_binary_symbol_interface_init(GLineGeneratorInterface *iface)
{
iface->count = (linegen_count_lines_fc)g_binary_symbol_count_lines;
iface->compute = (linegen_compute_fc)g_binary_symbol_compute_cursor;
- iface->contains = (linegen_contains_fc)g_binary_symbol_contains_cursor;
+ iface->contain = (linegen_contain_fc)g_binary_symbol_contain_cursor;
iface->get_flags = (linegen_get_flags_fc)g_binary_symbol_get_line_flags;
iface->print = (linegen_print_fc)g_binary_symbol_print;
@@ -774,7 +774,7 @@ void g_binary_symbol_compute_cursor(const GBinSymbol *symbol, gint x, size_t ind
* *
******************************************************************************/
-static int g_binary_symbol_contains_cursor(const GBinSymbol *symbol, size_t index, size_t repeat, const GLineCursor *cursor)
+static int g_binary_symbol_contain_cursor(const GBinSymbol *symbol, size_t index, size_t repeat, const GLineCursor *cursor)
{
int result; /* Conclusion à retourner */
vmpa2t addr; /* Autre emplacement à comparer*/
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);
diff --git a/src/gtkext/gtkbufferdisplay.c b/src/gtkext/gtkbufferdisplay.c
index 65b9603..eec0e5b 100644
--- a/src/gtkext/gtkbufferdisplay.c
+++ b/src/gtkext/gtkbufferdisplay.c
@@ -936,7 +936,7 @@ GBufferView *gtk_buffer_display_get_view(const GtkBufferDisplay *display)
* *
******************************************************************************/
-bool gtk_buffer_display_contains_cursor(const GtkBufferDisplay *display, const GLineCursor *cursor)
+bool gtk_buffer_display_contain_cursor(const GtkBufferDisplay *display, const GLineCursor *cursor)
{
bool result; /* Bilan à retourner */
GLineCursor *start; /* Position initiale du tampon */
diff --git a/src/gtkext/gtkbufferdisplay.h b/src/gtkext/gtkbufferdisplay.h
index 637c75c..2aec5a8 100644
--- a/src/gtkext/gtkbufferdisplay.h
+++ b/src/gtkext/gtkbufferdisplay.h
@@ -60,7 +60,7 @@ GBufferView *gtk_buffer_display_get_view(const GtkBufferDisplay *);
/* Détermine si une position est comprise dans l'affichage. */
-bool gtk_buffer_display_contains_cursor(const GtkBufferDisplay *, const GLineCursor *);
+bool gtk_buffer_display_contain_cursor(const GtkBufferDisplay *, const GLineCursor *);
/* Déplace le curseur à un emplacement en extrémité. */
bool gtk_buffer_display_move_caret_to(GtkBufferDisplay *, bool, gint *);
diff --git a/src/gtkext/gtkgraphdisplay.c b/src/gtkext/gtkgraphdisplay.c
index c1cc956..779cae1 100644
--- a/src/gtkext/gtkgraphdisplay.c
+++ b/src/gtkext/gtkgraphdisplay.c
@@ -1044,7 +1044,7 @@ static bool gtk_graph_display_get_cursor_coordinates(const GtkGraphDisplay *disp
if (!GTK_IS_BUFFER_DISPLAY(child))
continue;
- result = gtk_buffer_display_contains_cursor(GTK_BUFFER_DISPLAY(child), cursor);
+ result = gtk_buffer_display_contain_cursor(GTK_BUFFER_DISPLAY(child), cursor);
if (result)
{
generated by cgit v0.11.2-87-g4458 at 2024-05-03 09:04:15 (GMT)