projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update RPM requires
[yaz-moved-to-github.git]
/
src
/
oid_util.c
diff --git
a/src/oid_util.c
b/src/oid_util.c
index
7523158
..
ed60edc
100644
(file)
--- a/
src/oid_util.c
+++ b/
src/oid_util.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: oid_util.c,v 1.2 2007-04-12 20:47:28 adam Exp $
*/
/**
*/
/**
@@
-16,24
+14,24
@@
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
+#include <yaz/yaz-iconv.h>
#include <yaz/snprintf.h>
#include <yaz/oid_util.h>
#include <yaz/snprintf.h>
#include <yaz/oid_util.h>
-void oid_oidcpy(int *t, const int *s)
+void oid_oidcpy(Odr_oid *t, const Odr_oid *s)
{
while ((*(t++) = *(s++)) > -1);
}
{
while ((*(t++) = *(s++)) > -1);
}
-void oid_oidcat(int *t, const int *s)
+void oid_oidcat(Odr_oid *t, const Odr_oid *s)
{
while (*t > -1)
t++;
while ((*(t++) = *(s++)) > -1);
}
{
while (*t > -1)
t++;
while ((*(t++) = *(s++)) > -1);
}
-int oid_oidcmp(const int *o1, const int *o2)
+int oid_oidcmp(const Odr_oid *o1, const Odr_oid *o2)
{
while (*o1 == *o2 && *o1 > -1)
{
{
while (*o1 == *o2 && *o1 > -1)
{
@@
-48,7
+46,7
@@
int oid_oidcmp(const int *o1, const int *o2)
return -1;
}
return -1;
}
-int oid_oidlen(const int *o)
+int oid_oidlen(const Odr_oid *o)
{
int len = 0;
{
int len = 0;
@@
-58,13
+56,13
@@
int oid_oidlen(const int *o)
}
}
-char *oid_oid_to_dotstring(const int *oid, char *oidbuf)
+char *oid_oid_to_dotstring(const Odr_oid *oid, char *oidbuf)
{
char tmpbuf[20];
int i;
oidbuf[0] = '\0';
{
char tmpbuf[20];
int i;
oidbuf[0] = '\0';
- for (i = 0; oid[i] != -1 && i < OID_SIZE; i++)
+ for (i = 0; oid[i] != -1 && i < OID_SIZE; i++)
{
yaz_snprintf(tmpbuf, sizeof(tmpbuf)-1, "%d", oid[i]);
if (i > 0)
{
yaz_snprintf(tmpbuf, sizeof(tmpbuf)-1, "%d", oid[i]);
if (i > 0)
@@
-74,11
+72,11
@@
char *oid_oid_to_dotstring(const int *oid, char *oidbuf)
return oidbuf;
}
return oidbuf;
}
-int oid_dotstring_to_oid(const char *name, int *oid)
+int oid_dotstring_to_oid(const char *name, Odr_oid *oid)
{
int i = 0;
int val = 0;
{
int i = 0;
int val = 0;
- while (isdigit (*(unsigned char *) name))
+ while (yaz_isdigit (*name))
{
val = val*10 + (*name - '0');
name++;
{
val = val*10 + (*name - '0');
name++;
@@
-90,6
+88,8
@@
int oid_dotstring_to_oid(const char *name, int *oid)
name++;
}
}
name++;
}
}
+ if (i == 0)
+ return -1;
oid[i] = val;
oid[i+1] = -1;
return 0;
oid[i] = val;
oid[i+1] = -1;
return 0;
@@
-98,6
+98,7
@@
int oid_dotstring_to_oid(const char *name, int *oid)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab