Get rid of compiler warnings

git-svn-id: http://svn.osgeo.org/postgis/trunk@14078 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/extensions/address_standardizer/gamma.c b/extensions/address_standardizer/gamma.c
index b5bf2f8dbadeba0d160ef5ef1a926a75f006e3c7..bbf9d86494199ea3cd2b44c59a013d37479ccac1 100644 (file)
--- a/extensions/address_standardizer/gamma.c
+++ b/extensions/address_standardizer/gamma.c
@@ -173,9 +173,7 @@ int rules_add_rule(RULES *rules, int num, int *rule) {
         w ;
     SYMB a ,
          t ;
-    SYMB *rule_start ,
-         *r ,
-         *r_s ;
+    SYMB *rule_start , *r ;
     NODE u ;
     NODE **Trie ;
     KW *keyw ,
@@ -193,7 +191,7 @@ int rules_add_rule(RULES *rules, int num, int *rule) {
     /* get local copies of stuff saved in RULES */
     o_l = rules -> r_p -> output_link ;
     k_s = rules -> r_p -> key_space ;
-    r_s = rules -> r_p -> rule_space ;
+    
     Trie = rules -> Trie ;
     r = rules -> r ;
 

diff --git a/extensions/address_standardizer/pagc_std_api.h b/extensions/address_standardizer/pagc_std_api.h
index ebccb4672b2a487f0e694972eb9ec0ab1c89b33d..2e04293868ffeab4ea80fcd28f8ffadefc42d6b0 100644 (file)
--- a/extensions/address_standardizer/pagc_std_api.h
+++ b/extensions/address_standardizer/pagc_std_api.h
@@ -56,7 +56,7 @@ int rules_add_rule_from_str(RULES *rules, char *rule);
 int rules_ready(RULES *rules);
 void rules_free(RULES *rules);
 
-STANDARDIZER *std_init();
+STANDARDIZER *std_init(void);
 int std_use_lex(STANDARDIZER *std, LEXICON *lex);
 int std_use_gaz(STANDARDIZER *std, LEXICON *gaz);
 int std_use_rules(STANDARDIZER *std, RULES *rules);

diff --git a/extensions/address_standardizer/tokenize.c b/extensions/address_standardizer/tokenize.c
index 7e42777ac766193a9a4b77a4fc1921f307dd6d76..d8eee48b6d78112820263ff3a325dc3e58bba453 100644 (file)
--- a/extensions/address_standardizer/tokenize.c
+++ b/extensions/address_standardizer/tokenize.c
@@ -947,7 +947,6 @@ static void combine_lexemes( STAND_PARAM *s_p ,
                              struct morph * morph_p , 
                              DEF *d ) {
    /* -- combine the current Lexeme with the previous one -- */
-    int n ;
     LEXEME *CurLexVector, *PrevLexVector ; 
 
     /* -- find the two lexemes to combine -- */
@@ -956,7 +955,7 @@ static void combine_lexemes( STAND_PARAM *s_p ,
     PrevLexVector -> EndMorph = CurLexVector -> EndMorph ; /* the new end */ 
     PrevLexVector -> Text[ 0 ] = SENTINEL ; 
 
-    n = phrase_from_morphs( morph_p , 
+    phrase_from_morphs( morph_p , 
                             PrevLexVector -> Text , 
                             PrevLexVector -> StartMorph , 
                             PrevLexVector -> EndMorph ) ;