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
Add include
[yaz-moved-to-github.git]
/
zutil
/
charneg.c
diff --git
a/zutil/charneg.c
b/zutil/charneg.c
index
f8a5fd0
..
726d4f1
100644
(file)
--- a/
zutil/charneg.c
+++ b/
zutil/charneg.c
@@
-1,5
+1,5
@@
/*
/*
- $ $Id: charneg.c,v 1.4 2002-07-25 12:50:17 adam Exp $
+ $ $Id: charneg.c,v 1.7 2002-10-04 19:06:25 adam Exp $
* Helper functions for Character Set and Language Negotiation - 3
*/
* Helper functions for Character Set and Language Negotiation - 3
*/
@@
-7,6
+7,7
@@
#include <yaz/otherinfo.h>
#include <yaz/z-charneg.h>
#include <yaz/charneg.h>
#include <yaz/otherinfo.h>
#include <yaz/z-charneg.h>
#include <yaz/charneg.h>
+#include <yaz/yaz-util.h>
static Z_External* z_ext_record2(ODR o, int oid_class, int oid_value,
const char *buf, int len)
static Z_External* z_ext_record2(ODR o, int oid_class, int oid_value,
const char *buf, int len)
@@
-20,8
+21,8
@@
static Z_External* z_ext_record2(ODR o, int oid_class, int oid_value,
p->indirect_reference = 0;
oid.proto = PROTO_Z3950;
p->indirect_reference = 0;
oid.proto = PROTO_Z3950;
- oid.oclass = oid_class;
- oid.value = oid_value;
+ oid.oclass = (enum oid_class) oid_class;
+ oid.value = (enum oid_value) oid_value;
p->direct_reference = odr_oiddup(o, oid_getoidbyent(&oid));
p->which = Z_External_octet;
p->direct_reference = odr_oiddup(o, oid_getoidbyent(&oid));
p->which = Z_External_octet;
@@
-42,13
+43,13
@@
static int get_form(const char *charset)
int form = -1;
int form = -1;
- if (!strcmp (charset, "UCS-2"))
+ if (!yaz_matchstr(charset, "UCS-2"))
form = 2;
form = 2;
- if (!strcmp (charset, "UCS-4"))
+ if (!yaz_matchstr(charset, "UCS-4"))
form = 4;
form = 4;
- if (!strcmp (charset, "UTF-16"))
+ if (!yaz_matchstr(charset, "UTF-16"))
form = 5;
form = 5;
- if (!strcmp (charset, "UTF-8"))
+ if (!yaz_matchstr(charset, "UTF-8"))
form = 8;
return form;
form = 8;
return form;