projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make dict_str{cmp,ncmp,len} internal
[idzebra-moved-to-github.git]
/
dict
/
dictext.c
diff --git
a/dict/dictext.c
b/dict/dictext.c
index
06f13e3
..
ca610ae
100644
(file)
--- a/
dict/dictext.c
+++ b/
dict/dictext.c
@@
-1,6
+1,6
@@
-/* $Id: dictext.c,v 1.9 2002-08-02 19:26:55 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: dictext.c,v 1.15 2006-08-14 10:40:09 adam Exp $
+ Copyright (C) 1995-2006
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-15,9
+15,9
@@
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
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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
*/
@@
-28,7
+28,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <assert.h>
#include <ctype.h>
#include <assert.h>
#include <ctype.h>
-#include <zebrautl.h>
+#include <idzebra/util.h>
+#include <yaz/yaz-util.h>
char *prog;
char *prog;
@@
-42,7
+43,7
@@
int main (int argc, char **argv)
char ipf_buf[1024];
prog = *argv;
char ipf_buf[1024];
prog = *argv;
- while ((ret = options ("8vh", argv, argc, &arg)) != -2)
+ while ((ret = options("8vh", argv, argc, &arg)) != -2)
{
if (ret == 0)
{
{
if (ret == 0)
{
@@
-50,7
+51,7
@@
int main (int argc, char **argv)
inputfile = arg;
else
{
inputfile = arg;
else
{
- logf (LOG_FATAL, "too many files specified\n");
+ yaz_log (YLOG_FATAL, "too many files specified\n");
exit (1);
}
}
exit (1);
}
}
@@
-68,7
+69,7
@@
int main (int argc, char **argv)
use8 = 1;
else
{
use8 = 1;
else
{
- logf (LOG_FATAL, "Unknown option '-%s'", arg);
+ yaz_log (YLOG_FATAL, "Unknown option '-%s'", arg);
exit (1);
}
}
exit (1);
}
}
@@
-77,7
+78,7
@@
int main (int argc, char **argv)
ipf = fopen (inputfile, "r");
if (!ipf)
{
ipf = fopen (inputfile, "r");
if (!ipf)
{
- logf (LOG_FATAL|LOG_ERRNO, "cannot open '%s'", inputfile);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "cannot open '%s'", inputfile);
exit (1);
}
}
exit (1);
}
}
@@
-107,3
+108,11
@@
int main (int argc, char **argv)
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+