summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/pychrysalide/glibext/buffercache.c4
-rw-r--r--plugins/pychrysalide/glibext/bufferline.c4
-rw-r--r--plugins/pychrysalide/glibext/bufferview.c4
-rw-r--r--plugins/pychrysalide/glibext/constants.c2
-rw-r--r--src/analysis/binary.h2
-rw-r--r--src/analysis/block.h2
-rw-r--r--src/analysis/db/items/comment.h2
-rw-r--r--src/analysis/disass/output.h2
-rw-r--r--src/arch/operand.h2
-rw-r--r--src/arch/operands/feeder.h2
-rw-r--r--src/arch/register.h2
-rw-r--r--src/glibext/Makefile.am12
-rw-r--r--src/glibext/buffercache-int.h (renamed from src/glibext/gbuffercache-int.h)10
-rw-r--r--src/glibext/buffercache.c (renamed from src/glibext/gbuffercache.c)6
-rw-r--r--src/glibext/buffercache.h (renamed from src/glibext/gbuffercache.h)10
-rw-r--r--src/glibext/bufferline.c (renamed from src/glibext/gbufferline.c)4
-rw-r--r--src/glibext/bufferline.h (renamed from src/glibext/gbufferline.h)8
-rw-r--r--src/glibext/bufferview.c (renamed from src/glibext/gbufferview.c)4
-rw-r--r--src/glibext/bufferview.h (renamed from src/glibext/gbufferview.h)10
-rw-r--r--src/glibext/generators/hex.c2
-rw-r--r--src/glibext/generators/prologue.c2
-rw-r--r--src/glibext/generators/rborder.c2
-rw-r--r--src/glibext/linegen.h2
-rw-r--r--src/glibext/widthtracker.c (renamed from src/glibext/gwidthtracker.c)6
-rw-r--r--src/glibext/widthtracker.h (renamed from src/glibext/gwidthtracker.h)10
-rw-r--r--src/gtkext/gtkblockdisplay.h2
-rw-r--r--src/gtkext/gtkbufferdisplay.h2
27 files changed, 60 insertions, 60 deletions
diff --git a/plugins/pychrysalide/glibext/buffercache.c b/plugins/pychrysalide/glibext/buffercache.c
index fec5844..019d981 100644
--- a/plugins/pychrysalide/glibext/buffercache.c
+++ b/plugins/pychrysalide/glibext/buffercache.c
@@ -1,6 +1,6 @@
/* Chrysalide - Outil d'analyse de fichiers binaires
- * buffercache.c - équivalent Python du fichier "glibext/gbuffercache.c"
+ * buffercache.c - équivalent Python du fichier "glibext/buffercache.c"
*
* Copyright (C) 2018-2019 Cyrille Bagard
*
@@ -28,7 +28,7 @@
#include <pygobject.h>
-#include <glibext/gbuffercache-int.h>
+#include <glibext/buffercache-int.h>
#include <plugins/dt.h>
diff --git a/plugins/pychrysalide/glibext/bufferline.c b/plugins/pychrysalide/glibext/bufferline.c
index af3cf1d..dc59b85 100644
--- a/plugins/pychrysalide/glibext/bufferline.c
+++ b/plugins/pychrysalide/glibext/bufferline.c
@@ -1,6 +1,6 @@
/* Chrysalide - Outil d'analyse de fichiers binaires
- * bufferline.c - équivalent Python du fichier "glibext/gbufferline.h"
+ * bufferline.c - équivalent Python du fichier "glibext/bufferline.h"
*
* Copyright (C) 2018-2019 Cyrille Bagard
*
@@ -31,7 +31,7 @@
#include <i18n.h>
-#include <glibext/gbufferline.h>
+#include <glibext/bufferline.h>
#include <plugins/dt.h>
diff --git a/plugins/pychrysalide/glibext/bufferview.c b/plugins/pychrysalide/glibext/bufferview.c
index 725dd1a..98cc10a 100644
--- a/plugins/pychrysalide/glibext/bufferview.c
+++ b/plugins/pychrysalide/glibext/bufferview.c
@@ -1,6 +1,6 @@
/* Chrysalide - Outil d'analyse de fichiers binaires
- * bufferview.c - équivalent Python du fichier "glibext/gbufferview.c"
+ * bufferview.c - équivalent Python du fichier "glibext/bufferview.c"
*
* Copyright (C) 2019 Cyrille Bagard
*
@@ -28,7 +28,7 @@
#include <pygobject.h>
-#include <glibext/gbufferview.h>
+#include <glibext/bufferview.h>
#include "../access.h"
diff --git a/plugins/pychrysalide/glibext/constants.c b/plugins/pychrysalide/glibext/constants.c
index a7938cb..3f657e2 100644
--- a/plugins/pychrysalide/glibext/constants.c
+++ b/plugins/pychrysalide/glibext/constants.c
@@ -26,9 +26,9 @@
#include <i18n.h>
+#include <glibext/bufferline.h>
#include <glibext/linesegment.h>
#include <glibext/gbinportion.h>
-#include <glibext/gbufferline.h>
#include <glibext/gloadedpanel.h>
diff --git a/src/analysis/binary.h b/src/analysis/binary.h
index 178d186..194ccd0 100644
--- a/src/analysis/binary.h
+++ b/src/analysis/binary.h
@@ -36,7 +36,7 @@
#include "../arch/processor.h"
#include "../format/debuggable.h"
#include "../format/executable.h"
-#include "../glibext/gbuffercache.h"
+#include "../glibext/buffercache.h"
diff --git a/src/analysis/block.h b/src/analysis/block.h
index f902db0..63f0be0 100644
--- a/src/analysis/block.h
+++ b/src/analysis/block.h
@@ -33,7 +33,7 @@
#include "../arch/instruction.h"
#include "../arch/vmpa.h"
#include "../common/bits.h"
-#include "../glibext/gbufferview.h"
+#include "../glibext/bufferview.h"
#include "../glibext/linesegment.h"
diff --git a/src/analysis/db/items/comment.h b/src/analysis/db/items/comment.h
index 4eb1160..7049b28 100644
--- a/src/analysis/db/items/comment.h
+++ b/src/analysis/db/items/comment.h
@@ -30,7 +30,7 @@
#include "../../../arch/vmpa.h"
-#include "../../../glibext/gbufferline.h"
+#include "../../../glibext/bufferline.h"
diff --git a/src/analysis/disass/output.h b/src/analysis/disass/output.h
index 6b00250..20729d2 100644
--- a/src/analysis/disass/output.h
+++ b/src/analysis/disass/output.h
@@ -28,7 +28,7 @@
#include "../binary.h"
#include "../human/lang.h"
#include "../../format/preload.h"
-#include "../../glibext/gbuffercache.h"
+#include "../../glibext/buffercache.h"
#include "../../gtkext/gtkstatusstack.h"
diff --git a/src/arch/operand.h b/src/arch/operand.h
index 5789169..faeab49 100644
--- a/src/arch/operand.h
+++ b/src/arch/operand.h
@@ -30,7 +30,7 @@
#include "../common/packed.h"
#include "../format/format.h"
-#include "../glibext/gbufferline.h"
+#include "../glibext/bufferline.h"
diff --git a/src/arch/operands/feeder.h b/src/arch/operands/feeder.h
index 7cea504..d2b2cff 100644
--- a/src/arch/operands/feeder.h
+++ b/src/arch/operands/feeder.h
@@ -31,7 +31,7 @@
#include "../../common/packed.h"
#include "../../format/format.h"
-#include "../../glibext/gbufferline.h"
+#include "../../glibext/bufferline.h"
diff --git a/src/arch/register.h b/src/arch/register.h
index 48e8eff..10fa428 100644
--- a/src/arch/register.h
+++ b/src/arch/register.h
@@ -29,7 +29,7 @@
#include <stdbool.h>
-#include "../glibext/gbufferline.h"
+#include "../glibext/bufferline.h"
diff --git a/src/glibext/Makefile.am b/src/glibext/Makefile.am
index 4739fef..118ca39 100644
--- a/src/glibext/Makefile.am
+++ b/src/glibext/Makefile.am
@@ -4,6 +4,10 @@ BUILT_SOURCES = chrysamarshal.h chrysamarshal.c
noinst_LTLIBRARIES = libglibext.la
libglibext_la_SOURCES = \
+ buffercache-int.h \
+ buffercache.h buffercache.c \
+ bufferline.h bufferline.c \
+ bufferview.h bufferview.c \
chrysamarshal.h chrysamarshal.c \
configuration.h configuration.c \
delayed-int.h \
@@ -11,17 +15,12 @@ libglibext_la_SOURCES = \
gbinarycursor.h gbinarycursor.c \
gbinportion-int.h \
gbinportion.h gbinportion.c \
- gbuffercache-int.h \
- gbuffercache.h gbuffercache.c \
- gbufferline.h gbufferline.c \
- gbufferview.h gbufferview.c \
gdisplayoptions.h gdisplayoptions.c \
glinecursor-int.h \
glinecursor.h glinecursor.c \
gloadedpanel-int.h \
gloadedpanel.h gloadedpanel.c \
gnhash.h gnhash.c \
- gwidthtracker.h gwidthtracker.c \
linecolumn.h linecolumn.c \
linegen-int.h \
linegen.h linegen.c \
@@ -29,7 +28,8 @@ libglibext_la_SOURCES = \
objhole.h \
proto.h \
seq.h seq.c \
- signal.h signal.c
+ signal.h signal.c \
+ widthtracker.h widthtracker.c
libglibext_la_LIBADD = \
generators/libglibextgenerators.la
diff --git a/src/glibext/gbuffercache-int.h b/src/glibext/buffercache-int.h
index 6886fb0..3dfd5e2 100644
--- a/src/glibext/gbuffercache-int.h
+++ b/src/glibext/buffercache-int.h
@@ -1,6 +1,6 @@
/* Chrysalide - Outil d'analyse de fichiers binaires
- * gbuffercache-int.h - définitions internes d'affichage à la demande d'un ensemble de lignes
+ * buffercache-int.h - définitions internes d'affichage à la demande d'un ensemble de lignes
*
* Copyright (C) 2020 Cyrille Bagard
*
@@ -21,11 +21,11 @@
*/
-#ifndef _GLIBEXT_GBUFFERCACHE_INT_H
-#define _GLIBEXT_GBUFFERCACHE_INT_H
+#ifndef _GLIBEXT_BUFFERCACHE_INT_H
+#define _GLIBEXT_BUFFERCACHE_INT_H
-#include "gbuffercache.h"
+#include "buffercache.h"
@@ -93,4 +93,4 @@ struct _GBufferCacheClass
-#endif /* _GLIBEXT_GBUFFERCACHE_INT_H */
+#endif /* _GLIBEXT_BUFFERCACHE_INT_H */
diff --git a/src/glibext/gbuffercache.c b/src/glibext/buffercache.c
index b54de26..16d96dc 100644
--- a/src/glibext/gbuffercache.c
+++ b/src/glibext/buffercache.c
@@ -1,6 +1,6 @@
/* Chrysalide - Outil d'analyse de fichiers binaires
- * gbuffercache.c - affichage à la demande d'un ensemble de lignes
+ * buffercache.c - affichage à la demande d'un ensemble de lignes
*
* Copyright (C) 2016-2019 Cyrille Bagard
*
@@ -21,7 +21,7 @@
*/
-#include "gbuffercache.h"
+#include "buffercache.h"
#include <assert.h>
@@ -29,7 +29,7 @@
#include <stdlib.h>
-#include "gbuffercache-int.h"
+#include "buffercache-int.h"
#include "chrysamarshal.h"
diff --git a/src/glibext/gbuffercache.h b/src/glibext/buffercache.h
index 79158c4..5094b53 100644
--- a/src/glibext/gbuffercache.h
+++ b/src/glibext/buffercache.h
@@ -1,6 +1,6 @@
/* Chrysalide - Outil d'analyse de fichiers binaires
- * gbuffercache.h - prototypes pour l'affichage à la demande d'un ensemble de lignes
+ * buffercache.h - prototypes pour l'affichage à la demande d'un ensemble de lignes
*
* Copyright (C) 2016-2019 Cyrille Bagard
*
@@ -21,8 +21,8 @@
*/
-#ifndef _GLIBEXT_GBUFFERCACHE_H
-#define _GLIBEXT_GBUFFERCACHE_H
+#ifndef _GLIBEXT_BUFFERCACHE_H
+#define _GLIBEXT_BUFFERCACHE_H
#include <glib-object.h>
@@ -31,8 +31,8 @@
#include "gdisplayoptions.h"
-#include "gwidthtracker.h"
#include "linegen.h"
+#include "widthtracker.h"
@@ -130,4 +130,4 @@ bool g_buffer_cache_get_cursor_coordinates(const GBufferCache *, const GLineCurs
-#endif /* _GLIBEXT_GBUFFERCACHE_H */
+#endif /* _GLIBEXT_BUFFERCACHE_H */
diff --git a/src/glibext/gbufferline.c b/src/glibext/bufferline.c
index e3482aa..b9413e2 100644
--- a/src/glibext/gbufferline.c
+++ b/src/glibext/bufferline.c
@@ -1,6 +1,6 @@
/* Chrysalide - Outil d'analyse de fichiers binaires
- * gbufferline.c - représentation de fragments de texte en ligne
+ * bufferline.c - représentation de fragments de texte en ligne
*
* Copyright (C) 2010-2019 Cyrille Bagard
*
@@ -21,7 +21,7 @@
*/
-#include "gbufferline.h"
+#include "bufferline.h"
#include <assert.h>
diff --git a/src/glibext/gbufferline.h b/src/glibext/bufferline.h
index 11790fe..95db203 100644
--- a/src/glibext/gbufferline.h
+++ b/src/glibext/bufferline.h
@@ -1,6 +1,6 @@
/* Chrysalide - Outil d'analyse de fichiers binaires
- * gbufferline.h - prototypes pour la représentation de fragments de texte en ligne
+ * bufferline.h - prototypes pour la représentation de fragments de texte en ligne
*
* Copyright (C) 2010-2018 Cyrille Bagard
*
@@ -21,8 +21,8 @@
*/
-#ifndef _GLIBEXT_GBUFFERLINE_H
-#define _GLIBEXT_GBUFFERLINE_H
+#ifndef _GLIBEXT_BUFFERLINE_H
+#define _GLIBEXT_BUFFERLINE_H
#include <glib-object.h>
@@ -215,4 +215,4 @@ void g_buffer_line_draw(GBufferLine *, cairo_t *, const line_width_summary *, gi
-#endif /* _GLIBEXT_GBUFFERLINE_H */
+#endif /* _GLIBEXT_BUFFERLINE_H */
diff --git a/src/glibext/gbufferview.c b/src/glibext/bufferview.c
index 0df96cc..e40715e 100644
--- a/src/glibext/gbufferview.c
+++ b/src/glibext/bufferview.c
@@ -1,6 +1,6 @@
/* Chrysalide - Outil d'analyse de fichiers binaires
- * gbufferview.c - affichage d'une vue particulière d'un tampon de lignes
+ * bufferview.c - affichage d'une vue particulière d'un tampon de lignes
*
* Copyright (C) 2016-2019 Cyrille Bagard
*
@@ -21,7 +21,7 @@
*/
-#include "gbufferview.h"
+#include "bufferview.h"
#include <assert.h>
diff --git a/src/glibext/gbufferview.h b/src/glibext/bufferview.h
index 2930cf9..01da713 100644
--- a/src/glibext/gbufferview.h
+++ b/src/glibext/bufferview.h
@@ -1,6 +1,6 @@
/* Chrysalide - Outil d'analyse de fichiers binaires
- * gbufferview.h - prototypes pour l'affichage d'une vue particulière d'un tampon de lignes
+ * bufferview.h - prototypes pour l'affichage d'une vue particulière d'un tampon de lignes
*
* Copyright (C) 2016-2019 Cyrille Bagard
*
@@ -21,14 +21,14 @@
*/
-#ifndef _GLIBEXT_GBUFFERVIEW_H
-#define _GLIBEXT_GBUFFERVIEW_H
+#ifndef _GLIBEXT_BUFFERVIEW_H
+#define _GLIBEXT_BUFFERVIEW_H
#include <glib-object.h>
-#include "gbuffercache.h"
+#include "buffercache.h"
#include "gdisplayoptions.h"
@@ -112,4 +112,4 @@ bool g_buffer_view_get_cursor_coordinates(GBufferView *, const GLineCursor *, bo
-#endif /* _GLIBEXT_GBUFFERVIEW_H */
+#endif /* _GLIBEXT_BUFFERVIEW_H */
diff --git a/src/glibext/generators/hex.c b/src/glibext/generators/hex.c
index 13a76e3..b261f36 100644
--- a/src/glibext/generators/hex.c
+++ b/src/glibext/generators/hex.c
@@ -28,8 +28,8 @@
#include <ctype.h>
+#include "../bufferline.h"
#include "../gbinarycursor.h"
-#include "../gbufferline.h"
#include "../linegen-int.h"
#include "../linesegment.h"
#include "../../core/params.h"
diff --git a/src/glibext/generators/prologue.c b/src/glibext/generators/prologue.c
index 3295e73..5829fde 100644
--- a/src/glibext/generators/prologue.c
+++ b/src/glibext/generators/prologue.c
@@ -28,8 +28,8 @@
#include <malloc.h>
+#include "../bufferline.h"
#include "../gbinarycursor.h"
-#include "../gbufferline.h"
#include "../linegen-int.h"
#include "../linesegment.h"
#include "../../format/executable.h"
diff --git a/src/glibext/generators/rborder.c b/src/glibext/generators/rborder.c
index 8509376..8ff1271 100644
--- a/src/glibext/generators/rborder.c
+++ b/src/glibext/generators/rborder.c
@@ -29,8 +29,8 @@
#include <string.h>
+#include "../bufferline.h"
#include "../gbinarycursor.h"
-#include "../gbufferline.h"
#include "../linegen-int.h"
#include "../linesegment.h"
diff --git a/src/glibext/linegen.h b/src/glibext/linegen.h
index 74a889a..d40a598 100644
--- a/src/glibext/linegen.h
+++ b/src/glibext/linegen.h
@@ -28,7 +28,7 @@
#include <glib-object.h>
-#include "gbufferline.h"
+#include "bufferline.h"
#include "glinecursor.h"
#include "../analysis/content.h"
diff --git a/src/glibext/gwidthtracker.c b/src/glibext/widthtracker.c
index c9aff7b..274b53c 100644
--- a/src/glibext/gwidthtracker.c
+++ b/src/glibext/widthtracker.c
@@ -1,6 +1,6 @@
/* Chrysalide - Outil d'analyse de fichiers binaires
- * gwidthtracker.c - suivi des largeurs associées à un ensemble de lignes
+ * widthtracker.c - suivi des largeurs associées à un ensemble de lignes
*
* Copyright (C) 2016-2019 Cyrille Bagard
*
@@ -21,7 +21,7 @@
*/
-#include "gwidthtracker.h"
+#include "widthtracker.h"
#include <assert.h>
@@ -33,8 +33,8 @@
#include <i18n.h>
+#include "buffercache.h"
#include "delayed-int.h"
-#include "gbuffercache.h"
#include "../core/global.h"
#include "../core/nproc.h"
diff --git a/src/glibext/gwidthtracker.h b/src/glibext/widthtracker.h
index 610c736..b7bb8a4 100644
--- a/src/glibext/gwidthtracker.h
+++ b/src/glibext/widthtracker.h
@@ -1,6 +1,6 @@
/* Chrysalide - Outil d'analyse de fichiers binaires
- * gwidthtracker.h - prototypes pour le suivi des largeurs associées à un ensemble de lignes
+ * widthtracker.h - prototypes pour le suivi des largeurs associées à un ensemble de lignes
*
* Copyright (C) 2016-2018 Cyrille Bagard
*
@@ -21,16 +21,16 @@
*/
-#ifndef _GLIBEXT_GWIDTHTRACKER_H
-#define _GLIBEXT_GWIDTHTRACKER_H
+#ifndef _GLIBEXT_WIDTHTRACKER_H
+#define _GLIBEXT_WIDTHTRACKER_H
#include <glib-object.h>
#include <stdbool.h>
+#include "bufferline.h"
#include "delayed.h"
-#include "gbufferline.h"
#include "gdisplayoptions.h"
@@ -92,4 +92,4 @@ gint g_width_tracker_get_margin(GWidthTracker *, const GDisplayOptions *);
-#endif /* _GLIBEXT_GWIDTHTRACKER_H */
+#endif /* _GLIBEXT_WIDTHTRACKER_H */
diff --git a/src/gtkext/gtkblockdisplay.h b/src/gtkext/gtkblockdisplay.h
index 2b523c4..2effb9b 100644
--- a/src/gtkext/gtkblockdisplay.h
+++ b/src/gtkext/gtkblockdisplay.h
@@ -29,7 +29,7 @@
#include <gtk/gtk.h>
-#include "../glibext/gbufferview.h"
+#include "../glibext/bufferview.h"
diff --git a/src/gtkext/gtkbufferdisplay.h b/src/gtkext/gtkbufferdisplay.h
index 2aec5a8..8f2d63c 100644
--- a/src/gtkext/gtkbufferdisplay.h
+++ b/src/gtkext/gtkbufferdisplay.h
@@ -29,7 +29,7 @@
#include <gtk/gtk.h>
-#include "../glibext/gbufferview.h"
+#include "../glibext/bufferview.h"