From 9ce4dd5c57a5de7dace3059e3164cfd0f0e89044 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Mon, 8 May 2000 01:48:28 +0000 Subject: comment function, and fix an ABR. * ename/e-name-western.c (e_name_western_extract_middle): comment function, and fix an ABR. svn path=/trunk/; revision=2894 --- addressbook/ChangeLog | 5 +++++ addressbook/ename/e-name-western.c | 9 ++++++--- e-util/ename/e-name-western.c | 9 ++++++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 4a73b5d248..8f37c1388b 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,8 @@ +2000-05-07 Chris Toshok + + * ename/e-name-western.c (e_name_western_extract_middle): comment + function, and fix an ABR. + 2000-05-07 Chris Toshok * ename/e-name-western.c (e_name_western_cleanup_string): comment diff --git a/addressbook/ename/e-name-western.c b/addressbook/ename/e-name-western.c index 755d7eabed..057afdacc1 100644 --- a/addressbook/ename/e-name-western.c +++ b/addressbook/ename/e-name-western.c @@ -300,13 +300,16 @@ e_name_western_extract_middle (ENameWestern *name, ENameWesternIdxs *idxs) middle_idx = idxs->first_idx + strlen (name->first) + 1; + if (middle_idx > strlen (name->full)) + return; + + /* + * Search for the first space (or the terminating \0) + */ while (isspace (name->full [middle_idx]) && name->full [middle_idx] != '\0') middle_idx ++; - if (middle_idx > strlen (name->full)) - return; - if (name->full [middle_idx] == '\0') return; diff --git a/e-util/ename/e-name-western.c b/e-util/ename/e-name-western.c index 755d7eabed..057afdacc1 100644 --- a/e-util/ename/e-name-western.c +++ b/e-util/ename/e-name-western.c @@ -300,13 +300,16 @@ e_name_western_extract_middle (ENameWestern *name, ENameWesternIdxs *idxs) middle_idx = idxs->first_idx + strlen (name->first) + 1; + if (middle_idx > strlen (name->full)) + return; + + /* + * Search for the first space (or the terminating \0) + */ while (isspace (name->full [middle_idx]) && name->full [middle_idx] != '\0') middle_idx ++; - if (middle_idx > strlen (name->full)) - return; - if (name->full [middle_idx] == '\0') return; -- cgit