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
Mention VS 2013
[yaz-moved-to-github.git]
/
client
/
bertorture.c
diff --git
a/client/bertorture.c
b/client/bertorture.c
index
0ec3b7e
..
c48b668
100644
(file)
--- a/
client/bertorture.c
+++ b/
client/bertorture.c
@@
-1,7
+1,10
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <signal.h>
#if HAVE_SYS_TYPES_H
#include <signal.h>
#if HAVE_SYS_TYPES_H
@@
-26,6
+29,7
@@
static int stop = 0;
static int stop = 0;
+/*
static int send_packet(const char *host)
{
char buf[PACKET_SIZE];
static int send_packet(const char *host)
{
char buf[PACKET_SIZE];
@@
-51,7
+55,9
@@
static int send_packet(const char *host)
cs_close(cs);
return 0;
}
cs_close(cs);
return 0;
}
+*/
+/*
static void test_file(const char *fname)
{
Z_GDU *req;
static void test_file(const char *fname)
{
Z_GDU *req;
@@
-61,7
+67,7
@@
static void test_file(const char *fname)
int fd =open(fname, O_RDONLY, 0666);
if (fd == -1)
{
int fd =open(fname, O_RDONLY, 0666);
if (fd == -1)
{
- yaz_log(LOG_ERRNO|LOG_FATAL, "open %s", fname);
+ yaz_log(YLOG_ERRNO|YLOG_FATAL, "open %s", fname);
exit (1);
}
while (off < sizeof(buf))
exit (1);
}
while (off < sizeof(buf))
@@
-69,7
+75,7
@@
static void test_file(const char *fname)
ssize_t rd;
rd = read(fd, buf+off, sizeof(buf)-off);
if (rd == -1) {
ssize_t rd;
rd = read(fd, buf+off, sizeof(buf)-off);
if (rd == -1) {
- yaz_log(LOG_ERRNO|LOG_FATAL, "read %s", fname);
+ yaz_log(YLOG_ERRNO|YLOG_FATAL, "read %s", fname);
exit (1);
}
if (rd == 0)
exit (1);
}
if (rd == 0)
@@
-78,7
+84,7
@@
static void test_file(const char *fname)
}
if (close(fd) == -1)
{
}
if (close(fd) == -1)
{
- yaz_log(LOG_ERRNO|LOG_FATAL, "close %s", fname);
+ yaz_log(YLOG_ERRNO|YLOG_FATAL, "close %s", fname);
exit (1);
}
odr_setbuf(odr, buf, off, 0);
exit (1);
}
odr_setbuf(odr, buf, off, 0);
@@
-86,6
+92,7
@@
static void test_file(const char *fname)
odr_destroy(odr);
}
odr_destroy(odr);
}
+*/
static void test_random(int run, const char *fname, const char *fname2,
int *estat)
static void test_random(int run, const char *fname, const char *fname2,
int *estat)
@@
-111,7
+118,6
@@
static void test_random(int run, const char *fname, const char *fname2,
char *mbuf;
ODR odr;
char *mbuf;
ODR odr;
- nmem_init();
odr = odr_createmem(ODR_DECODE);
if (fname)
{
odr = odr_createmem(ODR_DECODE);
if (fname)
{
@@
-119,7
+125,7
@@
static void test_random(int run, const char *fname, const char *fname2,
int fd =open(fname, O_TRUNC|O_CREAT|O_WRONLY, 0666);
if (fd == -1)
{
int fd =open(fname, O_TRUNC|O_CREAT|O_WRONLY, 0666);
if (fd == -1)
{
- yaz_log(LOG_ERRNO|LOG_FATAL, "open %s", fname);
+ yaz_log(YLOG_ERRNO|YLOG_FATAL, "open %s", fname);
exit (1);
}
while (sizeof(buf)-j-off > 0)
exit (1);
}
while (sizeof(buf)-j-off > 0)
@@
-127,14
+133,14
@@
static void test_random(int run, const char *fname, const char *fname2,
ssize_t wrote;
wrote = write(fd, buf+off+j, sizeof(buf)-j-off);
if (wrote <= 0) {
ssize_t wrote;
wrote = write(fd, buf+off+j, sizeof(buf)-j-off);
if (wrote <= 0) {
- yaz_log(LOG_ERRNO|LOG_FATAL, "write %s", fname);
+ yaz_log(YLOG_ERRNO|YLOG_FATAL, "write %s", fname);
exit (1);
}
off += wrote;
}
if (close(fd) == -1)
{
exit (1);
}
off += wrote;
}
if (close(fd) == -1)
{
- yaz_log(LOG_ERRNO|LOG_FATAL, "close %s", fname);
+ yaz_log(YLOG_ERRNO|YLOG_FATAL, "close %s", fname);
exit (1);
}
}
exit (1);
}
}
@@
-154,7
+160,6
@@
static void test_random(int run, const char *fname, const char *fname2,
free(mbuf);
odr_reset(odr);
odr_destroy(odr);
free(mbuf);
odr_reset(odr);
odr_destroy(odr);
- nmem_exit();
}
if (dumpfile && dumpfile != stdout)
fclose(dumpfile);
}
if (dumpfile && dumpfile != stdout)
fclose(dumpfile);