aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e-util/ChangeLog8
-rw-r--r--e-util/ename/e-address-western.c4
-rw-r--r--e-util/ename/e-name-western.c4
3 files changed, 13 insertions, 3 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index da8181f420..72b58c06e5 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-26 Michael Meeks <michael@helixcode.com>
+
+ * ename/e-address-western.c (e_address_western_is_postal):
+ unsigned chars.
+
+ * ename/e-name-western.c (e_name_western_get_one_prefix_at_str):
+ cast to unsigned char.
+
2000-10-25 Dan Winship <danw@helixcode.com>
* e-html-utils.c (e_text_to_html): Deal properly with URLs at the
diff --git a/e-util/ename/e-address-western.c b/e-util/ename/e-address-western.c
index 9ab6568338..12e977b973 100644
--- a/e-util/ename/e-address-western.c
+++ b/e-util/ename/e-address-western.c
@@ -149,7 +149,7 @@ e_address_western_is_po_box (gchar *line)
deemed to be the line in the form of <town, region postal-code>. */
static gboolean
-e_address_western_is_postal (gchar *line)
+e_address_western_is_postal (guchar *line)
{
gboolean retval;
int cntr;
@@ -166,7 +166,7 @@ e_address_western_is_postal (gchar *line)
while (isspace(line[index]))
index++;
- if (!isalpha(line[index]))
+ if (!isalpha (line[index]))
return FALSE; /* FIXME: ugly control flow. */
cntr = strlen(line) - 1;
diff --git a/e-util/ename/e-name-western.c b/e-util/ename/e-name-western.c
index 698cceec0b..3848e7249b 100644
--- a/e-util/ename/e-name-western.c
+++ b/e-util/ename/e-name-western.c
@@ -164,7 +164,9 @@ e_name_western_get_one_prefix_at_str (char *str)
*/
word = e_name_western_get_words_at_idx (str, 0, 1);
- if (strlen (word) > 2 && isalpha (word [0]) && isalpha (word [1]) &&
+ if (strlen (word) > 2 &&
+ isalpha ((unsigned char) word [0]) &&
+ isalpha ((unsigned char) word [1]) &&
word [strlen (word) - 1] == '.')
return word;