projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bad memory reference that could occur if empty key block was to
[idzebra-moved-to-github.git]
/
index
/
zebrash.c
diff --git
a/index/zebrash.c
b/index/zebrash.c
index
73cc7d4
..
333b378
100644
(file)
--- a/
index/zebrash.c
+++ b/
index/zebrash.c
@@
-1,4
+1,4
@@
-/* $Id: zebrash.c,v 1.42 2007-01-15 15:10:17 adam Exp $
+/* $Id: zebrash.c,v 1.44 2007-03-19 21:50:39 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
Copyright (C) 1995-2007
Index Data ApS
@@
-355,14
+355,14
@@
static int cmd_record_insert( char *args[], WRBUF outbuff)
int rc;
char *rec=restargs(args,1);
int rc;
char *rec=restargs(args,1);
- rc = zebra_insert_record(zh,
+ rc = zebra_update_record(zh,
+ action_insert,
0, /* record type */
&sysno,
0, /* match */
0, /* fname */
rec,
0, /* record type */
&sysno,
0, /* match */
0, /* fname */
rec,
- strlen(rec),
- 0);
+ strlen(rec));
if (0==rc)
{
wrbuf_printf(outbuff,"ok sysno=" ZINT_FORMAT "\n",sysno);
if (0==rc)
{
wrbuf_printf(outbuff,"ok sysno=" ZINT_FORMAT "\n",sysno);
@@
-383,8
+383,12
@@
static int cmd_exchange_record( char *args[], WRBUF outbuff)
onecommand("help exchange_record", outbuff, "");
return -90;
}
onecommand("help exchange_record", outbuff, "");
return -90;
}
- rc=zebra_admin_exchange_record(zh, rec, strlen(rec),
- id, strlen(id), atoi(action));
+
+ rc = zebra_update_record(zh, action_update, 0 /* record_type */,
+ 0 /* sysno */,
+ id /* match */,
+ 0 /* fname */,
+ rec, strlen(rec));
return rc;
}
return rc;
}
@@
-415,14
+419,14
@@
static int cmd_find( char *args[], WRBUF outbuff)
wrbuf_puts(qry,restargs(args,1));
if (!zh)
onecommand("quickstart", outbuff, "");
wrbuf_puts(qry,restargs(args,1));
if (!zh)
onecommand("quickstart", outbuff, "");
- wrbuf_printf(outbuff, "find %s\n",wrbuf_buf(qry));
- rc = zebra_search_PQF(zh, wrbuf_buf(qry), setname, &hits);
+ wrbuf_printf(outbuff, "find %s\n",wrbuf_cstr(qry));
+ rc = zebra_search_PQF(zh, wrbuf_cstr(qry), setname, &hits);
if (0==rc)
{
wrbuf_printf(outbuff, ZINT_FORMAT " hits found\n", hits);
nextrecno = 1;
}
if (0==rc)
{
wrbuf_printf(outbuff, ZINT_FORMAT " hits found\n", hits);
nextrecno = 1;
}
- wrbuf_free(qry, 1);
+ wrbuf_destroy(qry);
return rc;
}
return rc;
}
@@
-808,7
+812,7
@@
void shell(void)
/* get rid of \n in line */
if ((nl_cp = strchr(buf, '\n')))
*nl_cp = '\0';
/* get rid of \n in line */
if ((nl_cp = strchr(buf, '\n')))
*nl_cp = '\0';
- strncpy(prevout, wrbuf_buf(outbuff), MAX_OUT_BUFF);
+ strncpy(prevout, wrbuf_cstr(outbuff), MAX_OUT_BUFF);
wrbuf_rewind(outbuff);
rc=onecommand(buf, outbuff, prevout);
if (rc==0)
wrbuf_rewind(outbuff);
rc=onecommand(buf, outbuff, prevout);
if (rc==0)
@@
-821,9
+825,9
@@
void shell(void)
wrbuf_printf(outbuff, " command returned %d\n",rc);
}
Zerrors(outbuff);
wrbuf_printf(outbuff, " command returned %d\n",rc);
}
Zerrors(outbuff);
- printf("%s\n", wrbuf_buf(outbuff));
+ printf("%s\n", wrbuf_cstr(outbuff));
} /* while */
} /* while */
- wrbuf_free(outbuff,1);
+ wrbuf_destroy(outbuff);
} /* shell() */
} /* shell() */