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
Version 4.2.7
[yaz-moved-to-github.git]
/
src
/
odr_util.c
diff --git
a/src/odr_util.c
b/src/odr_util.c
index
c28c586
..
aea6a4a
100644
(file)
--- a/
src/odr_util.c
+++ b/
src/odr_util.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2011 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: odr_util.c,v 1.12 2007-04-12 20:47:28 adam Exp $
*/
/**
* \file odr_util.c
*/
/**
* \file odr_util.c
@@
-14,7
+12,6
@@
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include "odr-priv.h"
#include <yaz/oid_util.h>
#include "odr-priv.h"
#include <yaz/oid_util.h>
@@
-50,7
+47,8
@@
Odr_oid *odr_oiddup_nmem(NMEM nmem, const Odr_oid *o)
if (!o)
return 0;
if (!o)
return 0;
- if (!(r = (int *)nmem_malloc(nmem, (oid_oidlen(o) + 1) * sizeof(int))))
+ if (!(r = (Odr_oid *)
+ nmem_malloc(nmem, (oid_oidlen(o) + 1) * sizeof(Odr_oid))))
return 0;
oid_oidcpy(r, o);
return r;
return 0;
oid_oidcpy(r, o);
return r;
@@
-63,12
+61,12
@@
Odr_oid *odr_oiddup(ODR odr, const Odr_oid *o)
Odr_oid *odr_getoidbystr_nmem(NMEM nmem, const char *str)
{
Odr_oid *odr_getoidbystr_nmem(NMEM nmem, const char *str)
{
- int oid[OID_SIZE];
- int *ret;
+ Odr_oid oid[OID_SIZE];
+ Odr_oid *ret;
if (oid_dotstring_to_oid(str, oid))
return 0;
if (oid_dotstring_to_oid(str, oid))
return 0;
- ret = (int *)nmem_malloc(nmem, sizeof(*ret)*(oid_oidlen(oid) + 1));
+ ret = (Odr_oid *)nmem_malloc(nmem, sizeof(*ret)*(oid_oidlen(oid) + 1));
oid_oidcpy(ret, oid);
return ret;
}
oid_oidcpy(ret, oid);
return ret;
}
@@
-118,6
+116,7
@@
char *odr_prepend(ODR o, const char *prefix, const char *old)
/*
* 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