Break long lines in debian/control

[idzebra-moved-to-github.git] / dict / scan.c

diff --git a/dict/scan.c b/dict/scan.c
index 1305182..76032f3 100644 (file)
--- a/dict/scan.c
+++ b/dict/scan.c
@@ -1,26 +1,26 @@
-/* $Id: scan.c,v 1.24 2006-09-05 12:50:56 adam Exp $
-   Copyright (C) 1995-2006
-   Index Data ApS
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
 
-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 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.
 
-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
+   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
 
 */
 
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -38,7 +38,7 @@ static void scan_direction(Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
     short *indxp;
     char *info;
 
-    dict_bf_readp (dict->dbf, ptr, &p);
+    dict_bf_readp(dict->dbf, ptr, &p);
     hi = DICT_nodir(p)-1;
     if (start != -1)
         lo = start;
@@ -82,39 +82,39 @@ static void scan_direction(Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
             /* char *               information */
 
             info = (char*)p - indxp[-lo];
-            memcpy (&dc, info+sizeof(Dict_ptr), sizeof(Dict_char));
+            memcpy(&dc, info+sizeof(Dict_ptr), sizeof(Dict_char));
             str[pos] = dc;
-           memcpy (&subptr, info, sizeof(Dict_ptr));
+           memcpy(&subptr, info, sizeof(Dict_ptr));
            if (dir>0 && info[sizeof(Dict_ptr)+sizeof(Dict_char)])
             {
-                 str[pos+1] = DICT_EOS;
-                 if ((*userfunc)((char*) str,
-                                 info+sizeof(Dict_ptr)+sizeof(Dict_char),
-                                 *count * dir, client))
-                 {
-                     *count = 0;
-                 }
-                 else
-                     --(*count);
+                str[pos+1] = DICT_EOS;
+                if ((*userfunc)((char*) str,
+                                info+sizeof(Dict_ptr)+sizeof(Dict_char),
+                                *count * dir, client))
+                {
+                    *count = 0;
+                }
+                else
+                    --(*count);
             }
             if (*count>0 && subptr)
             {
-               scan_direction (dict, subptr, pos+1, str, -1, count, 
-                                client, userfunc, dir);
-                dict_bf_readp (dict->dbf, ptr, &p);
+               scan_direction(dict, subptr, pos+1, str, -1, count, 
+                               client, userfunc, dir);
+                dict_bf_readp(dict->dbf, ptr, &p);
                 indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short)); 
            }
            if (*count>0 && dir<0 && info[sizeof(Dict_ptr)+sizeof(Dict_char)])
             {
-                 str[pos+1] = DICT_EOS;
-                 if ((*userfunc)((char*) str,
-                                 info+sizeof(Dict_ptr)+sizeof(Dict_char),
-                                 *count * dir, client))
-                 {
-                     *count = 0;
-                 }
-                 else
-                     --(*count);
+                str[pos+1] = DICT_EOS;
+                if ((*userfunc)((char*) str,
+                                info+sizeof(Dict_ptr)+sizeof(Dict_char),
+                                *count * dir, client))
+                {
+                    *count = 0;
+                }
+                else
+                    --(*count);
             }
         }
         lo += dir;
@@ -130,7 +130,7 @@ void dict_scan_r(Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
     short *indxp;
     char *info;
 
-    dict_bf_readp (dict->dbf, ptr, &p);
+    dict_bf_readp(dict->dbf, ptr, &p);
     if (!p)
         return;
     mid = lo = 0;
@@ -145,7 +145,7 @@ void dict_scan_r(Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
             /* unsigned char        length of information */
             /* char *               information */
            info = (char*)p + indxp[-mid];
-           cmp = dict_strcmp ((Dict_char*) info, str + pos);
+           cmp = dict_strcmp((Dict_char*) info, str + pos);
            if (!cmp)
             {
                 if (*after)
@@ -173,11 +173,11 @@ void dict_scan_r(Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
             /* unsigned char        length of information */
             /* char *               information */
             info = (char*)p - indxp[-mid];
-            memcpy (&dc, info+sizeof(Dict_ptr), sizeof(Dict_char));
+            memcpy(&dc, info+sizeof(Dict_ptr), sizeof(Dict_char));
            cmp = dc - str[pos];
            if (!cmp)
             {
-               memcpy (&subptr, info, sizeof(Dict_ptr));
+               memcpy(&subptr, info, sizeof(Dict_ptr));
                 if (str[pos+1] == DICT_EOS)
                 {
                    if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
@@ -199,10 +199,27 @@ void dict_scan_r(Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
                        scan_direction(dict, subptr, pos+1, str, -1, 
                                        after, client, userfunc, 1);
                 }
-               else if (subptr)
+               else
                 {
-                    dict_scan_r(dict, subptr, pos+1, str, before, after,
-                                client, userfunc);
+                    if (subptr)
+                        dict_scan_r(dict, subptr, pos+1, str, before, after,
+                                    client, userfunc);
+                   if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
+                    {
+                        if (*before)
+                        {
+                            str[pos+1] = DICT_EOS;
+                            if ((*userfunc)((char*) str,
+                                            info+sizeof(Dict_ptr)+
+                                            sizeof(Dict_char),
+                                            - *before, client))
+                            {
+                                *before = 0;
+                            }
+                            else
+                                --(*before);
+                        }
+                    }
                 }
                 break;
             }
@@ -242,6 +259,7 @@ int dict_scan(Dict dict, char *str, int *before, int *after, void *client,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab