Omit CVS Id. Update copyright year.

[idzebra-moved-to-github.git] / util / zebramap.c

diff --git a/util/zebramap.c b/util/zebramap.c
index c833799..c6f3da9 100644 (file)
--- a/util/zebramap.c
+++ b/util/zebramap.c
@@ -1,23 +1,20 @@
-/* $Id: zebramap.c,v 1.76 2007-12-20 19:02:12 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-   This file is part of the Zebra server.
-
-   Zebra is free software; you can redistribute it and/or modify it under
-   the terms of the GNU General Public License as published by the Free
-   Software Foundation; either version 2, or (at your option) any later
-   version.
-
-   Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
-   WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Zebra; see the file LICENSE.zebra.  If not, write to the
-   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+/* This file is part of the Zebra server.
+   Copyright (C) 1995-2008 Index Data
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <assert.h>
@@ -716,12 +713,13 @@ int zebra_map_tokenize_start(zebra_map_t zm,
         icu_chain_assign_cstr(zm->icu_chain,
                               wrbuf_cstr(zm->input_str),
                               &status);
-        if (zm->debug)
+        if (!U_SUCCESS(status))
         {
-            if (!U_SUCCESS(status))
+            if (zm->debug)
             {
                 yaz_log(YLOG_WARN, "bad encoding for input");
             }
+            return -1;
         }
     }
 #endif
@@ -730,6 +728,7 @@ int zebra_map_tokenize_start(zebra_map_t zm,
 
 int zebra_maps_is_icu(zebra_map_t zm)
 {
+    assert(zm);
 #if YAZ_HAVE_ICU
     return zm->use_chain;
 #else