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
Fix bug introduced in srw.c revision 1.37
[yaz-moved-to-github.git]
/
src
/
z3950oid.c
diff --git
a/src/z3950oid.c
b/src/z3950oid.c
index
86f500a
..
435ed4e
100644
(file)
--- a/
src/z3950oid.c
+++ b/
src/z3950oid.c
@@
-1,8
+1,8
@@
/*
/*
- * Copyright (c) 1995-2003, Index Data
+ * Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: z3950oid.c,v 1.1 2003-10-27 12:21:36 adam Exp $
+ * $Id: z3950oid.c,v 1.4 2005-06-25 15:46:06 adam Exp $
*/
#if HAVE_CONFIG_H
*/
#if HAVE_CONFIG_H
@@
-21,7
+21,7
@@
Odr_oid *yaz_oidval_to_z3950oid (ODR o, int oid_class, int oid_value)
ident.value = (enum oid_value) oid_value;
if (ident.value == VAL_NONE)
ident.value = (enum oid_value) oid_value;
if (ident.value == VAL_NONE)
- return 0;
+ return 0;
return odr_oiddup(o, oid_ent_to_oid(&ident, oid));
}
return odr_oiddup(o, oid_ent_to_oid(&ident, oid));
}
@@
-36,7
+36,7
@@
Odr_oid *yaz_str_to_z3950oid (ODR o, int oid_class, const char *str)
ident.value = oid_getvalbyname(str);
if (ident.value == VAL_NONE)
ident.value = oid_getvalbyname(str);
if (ident.value == VAL_NONE)
- return 0;
+ return 0;
return odr_oiddup(o, oid_ent_to_oid(&ident, oid));
}
return odr_oiddup(o, oid_ent_to_oid(&ident, oid));
}
@@
-46,7
+46,7
@@
const char *yaz_z3950oid_to_str (Odr_oid *oid, int *oid_class)
struct oident *ident = oid_getentbyoid(oid);
if (!ident || ident->value == VAL_NONE)
struct oident *ident = oid_getentbyoid(oid);
if (!ident || ident->value == VAL_NONE)
- return 0;
+ return 0;
*oid_class = ident->oclass;
return ident->desc;
}
*oid_class = ident->oclass;
return ident->desc;
}
@@
-70,13
+70,11
@@
const char* yaz_z3950_oid_value_to_str(oid_value ov, oid_class oc)
return "";
}
}
return "";
}
}
-
-
/*
* Local variables:
/*
* Local variables:
- * tab-width: 8
* c-basic-offset: 4
* c-basic-offset: 4
+ * indent-tabs-mode: nil
* End:
* End:
- * vim600: sw=4 ts=8 fdm=marker
- * vim<600: sw=4 ts=8
+ * vim: shiftwidth=4 tabstop=8 expandtab
*/
*/
+