Cleaned the code handling binary symbols.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@548 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

1 files changed, 8 insertions, 19 deletions

diff --git a/src/format/symbol.h b/src/format/symbol.h
index 49cde56..e0b657d 100644
--- a/src/format/symbol.h
+++ b/src/format/symbol.h
@@ -52,7 +52,8 @@ typedef enum _SymbolType
 #define G_TYPE_BIN_SYMBOL               g_binary_symbol_get_type()
 #define G_BIN_SYMBOL(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj), g_binary_symbol_get_type(), GBinSymbol))
 #define G_IS_BIN_SYMBOL(obj)            (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_binary_symbol_get_type()))
-#define G_BIN_SYMBOL_GET_IFACE(inst)    (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_binary_symbol_get_type(), GBinSymbolIface))
+#define G_BIN_SYMBOL_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_BIN_SYMBOL, GBinSymbolClass))
+#define G_IS_BIN_SYMBOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_BIN_SYMBOL))
 #define G_BIN_SYMBOL_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_BIN_SYMBOL, GBinSymbolClass))
 
 
@@ -67,7 +68,7 @@ typedef struct _GBinSymbolClass GBinSymbolClass;
 GType g_binary_symbol_get_type(void);
 
 /* Crée un nouveau symbole d'exécutable. */
-GBinSymbol *g_binary_symbol_new(SymbolType, const char *, vmpa_t);
+GBinSymbol *g_binary_symbol_new(SymbolType);
 
 /* Compare deux symboles d'exécutable selon leurs propriétés. */
 int g_binary_symbol_cmp(const GBinSymbol **, const GBinSymbol **);
@@ -75,30 +76,18 @@ int g_binary_symbol_cmp(const GBinSymbol **, const GBinSymbol **);
 /* Fournit le type du symbole. */
 SymbolType g_binary_symbol_get_target_type(const GBinSymbol *);
 
-/* Fournit la description humaine du symbole. */
-const char *g_binary_symbol_to_string(const GBinSymbol *);
-
-/* Fournit l'adresse associée à un symbole. */
-vmpa_t g_binary_symbol_get_address(const GBinSymbol *); ///////////////////
-
-
-
-void g_binary_symbol_set_label(GBinSymbol *symbol, const char *lbl);
-
-
-
 /* Fournit un étiquette pour viser un symbole. */
 const char *g_binary_symbol_get_label(const GBinSymbol *);
 
+/* Définit un autre nom pour le symbole. */
+void g_binary_symbol_set_alt_label(GBinSymbol *, const char *);
+
 /* Raffine la définition de l'emplacement d'un symbole. */
 void g_binary_symbol_fix_range(GBinSymbol *, const vmpa2t *);
 
 /* Fournit l'emplacement où se situe un symbole. */
 const mrange_t *g_binary_symbol_get_range(const GBinSymbol *);
 
-/* Définit un autre nom pour le symbole. */
-void g_binary_symbol_set_alt_name(GBinSymbol *, char *);
-
 /* Attache la routine associée au symbole. */
 void _g_binary_symbol_attach_routine(GBinSymbol *, GBinRoutine *, SymbolType);
 
@@ -137,7 +126,7 @@ GDbComment *g_binary_symbol_get_comment(const GBinSymbol *);
     do                                                          \
     {                                                           \
         _cmt = g_db_comment_new(_pos, _txt, true);              \
-        _sym = g_binary_symbol_new(STP_DATA, NULL, 0);          \
+        _sym = g_binary_symbol_new(STP_DATA);                   \
         g_binary_symbol_attach_instruction(_sym, _ins);         \
         g_binary_symbol_set_comment(_sym, _cmt);                \
         g_binary_format_add_symbol(G_BIN_FORMAT(_fmt), _sym);   \
@@ -147,7 +136,7 @@ GDbComment *g_binary_symbol_get_comment(const GBinSymbol *);
 #define ADD_STR_AS_SYM(_fmt, _sym, _ins)                        \
     do                                                          \
     {                                                           \
-        _sym = g_binary_symbol_new(STP_RO_STRING, NULL, 0);          \
+        _sym = g_binary_symbol_new(STP_RO_STRING);              \
         g_binary_symbol_attach_instruction(_sym, _ins);         \
         g_binary_format_add_symbol(G_BIN_FORMAT(_fmt), _sym);   \
     }                                                           \