diff options
| -rw-r--r-- | addressbook/ChangeLog | 4 | ||||
| -rw-r--r-- | addressbook/ename/e-address-western.c | 8 | ||||
| -rw-r--r-- | e-util/ename/e-address-western.c | 8 |
3 files changed, 14 insertions, 6 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 8cfbc5945a..d4a049e8a0 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,7 @@ +2000-09-11 Christopher James Lahey <clahey@helixcode.com> + + * ename/e-address-western.c: Fixed some warnings. + 2000-09-11 Jesse Pavel <jpavel@helixcode.com> * ename/e-address-western.c: fixed certain address parsing diff --git a/addressbook/ename/e-address-western.c b/addressbook/ename/e-address-western.c index af1d112fd6..a8e16e1eba 100644 --- a/addressbook/ename/e-address-western.c +++ b/addressbook/ename/e-address-western.c @@ -120,7 +120,7 @@ e_address_western_remove_blank_lines (gchar *lines[], gint *linecntr) static gboolean e_address_western_is_po_box (gchar *line) { - gboolean retval; + gboolean retval = FALSE; /* In which phase of processing are we? */ enum State { FIRSTCHAR, SECONDCHAR, WHITESPACE } state; @@ -299,10 +299,10 @@ e_address_western_extract_postal_code (gchar *line) -void +static void e_address_western_extract_street (gchar *line, gchar **street, gchar **extended) { - gchar *split = NULL; + const gchar *split = NULL; gint cntr; for (cntr = 0; extended_keywords[cntr] != NULL; cntr++) { @@ -334,7 +334,9 @@ e_address_western_parse (const gchar *in_address) gboolean found_po_box, found_postal; EAddressWestern *eaw; +#if 0 gint start, end; /* To be used to classify address lines. */ +#endif if (in_address == NULL) return NULL; diff --git a/e-util/ename/e-address-western.c b/e-util/ename/e-address-western.c index af1d112fd6..a8e16e1eba 100644 --- a/e-util/ename/e-address-western.c +++ b/e-util/ename/e-address-western.c @@ -120,7 +120,7 @@ e_address_western_remove_blank_lines (gchar *lines[], gint *linecntr) static gboolean e_address_western_is_po_box (gchar *line) { - gboolean retval; + gboolean retval = FALSE; /* In which phase of processing are we? */ enum State { FIRSTCHAR, SECONDCHAR, WHITESPACE } state; @@ -299,10 +299,10 @@ e_address_western_extract_postal_code (gchar *line) -void +static void e_address_western_extract_street (gchar *line, gchar **street, gchar **extended) { - gchar *split = NULL; + const gchar *split = NULL; gint cntr; for (cntr = 0; extended_keywords[cntr] != NULL; cntr++) { @@ -334,7 +334,9 @@ e_address_western_parse (const gchar *in_address) gboolean found_po_box, found_postal; EAddressWestern *eaw; +#if 0 gint start, end; /* To be used to classify address lines. */ +#endif if (in_address == NULL) return NULL; |