From b0555501e434d0f71f97ea17f282db2e795ff950 Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Thu, 10 Jul 2003 11:50:32 +0000 Subject: [PATCH] Remove the oid_name_to_dotstring() function, which is now in oid.c (with a somewhat modified interface). Change the invocation to use the new thread-safe interface. --- zoom/zoomsh.c | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c index 5f64c04..c6b29ae 100644 --- a/zoom/zoomsh.c +++ b/zoom/zoomsh.c @@ -1,5 +1,5 @@ /* - * $Id: zoomsh.c,v 1.21 2003-07-09 23:00:21 mike Exp $ + * $Id: zoomsh.c,v 1.22 2003-07-10 11:50:32 mike Exp $ * * ZOOM-C Shell */ @@ -143,35 +143,6 @@ static void cmd_close (ZOOM_connection *c, ZOOM_resultset *r, } } -static const char *oid_name_to_dotstring(const char *name) { - struct oident ent; - int oid[OID_SIZE]; - static char oidbuf[100]; /* ### bad interface */ - int i; - - /* Translate syntax to oid_val */ - oid_value value = oid_getvalbyname(name); - - /* Build it into an oident */ - ent.proto = PROTO_Z3950; - ent.oclass = CLASS_RECSYN; - ent.value = value; - - /* Translate to an array of int */ - (void) oid_ent_to_oid(&ent, oid); - - /* Write the array of int into a dotted string (phew!) */ - oidbuf[0] = '\0'; - for (i = 0; oid[i] != -1; i++) { - char tmpbuf[20]; - sprintf(tmpbuf, "%d", oid[i]); - if (i > 0) strcat(oidbuf, "."); - strcat(oidbuf, tmpbuf); - } - - return oidbuf; -} - static void display_records (ZOOM_connection c, ZOOM_resultset r, int start, int count) @@ -188,9 +159,10 @@ static void display_records (ZOOM_connection c, /* if rec is non-null, we got a record for display */ if (rec) { - const char *syntax_oid = oid_name_to_dotstring(syntax); + char oidbuf[100]; + (void) oid_name_to_dotstring(CLASS_RECSYN, syntax, oidbuf); printf ("%d %s %s (%s)\n", - pos+1, (db ? db : "unknown"), syntax, syntax_oid); + pos+1, (db ? db : "unknown"), syntax, oidbuf); if (render) fwrite (render, 1, len, stdout); printf ("\n"); -- 1.7.10.4