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
Merge branch 'master' into yaz4
[yaz-moved-to-github.git]
/
test
/
tstnmem.c
diff --git
a/test/tstnmem.c
b/test/tstnmem.c
index
000c7d2
..
606c676
100644
(file)
--- a/
test/tstnmem.c
+++ b/
test/tstnmem.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: tstnmem.c,v 1.6 2006-01-29 21:59:13 adam Exp $
*/
#if HAVE_CONFIG_H
*/
#if HAVE_CONFIG_H
@@
-23,13
+21,12
@@
void tst(void)
int j;
char *cp;
int j;
char *cp;
- nmem_init();
n = nmem_create();
YAZ_CHECK(n);
for (j = 1; j<500; j++)
{
n = nmem_create();
YAZ_CHECK(n);
for (j = 1; j<500; j++)
{
- cp = nmem_malloc(n, j);
+ cp = (char *) nmem_malloc(n, j);
YAZ_CHECK(cp);
if (sizeof(long) >= j)
*(long*) cp = 123L;
YAZ_CHECK(cp);
if (sizeof(long) >= j)
*(long*) cp = 123L;
@@
-43,11
+40,10
@@
void tst(void)
for (j = 2000; j<20000; j+= 2000)
{
for (j = 2000; j<20000; j+= 2000)
{
- cp = nmem_malloc(n, j);
+ cp = (char *) nmem_malloc(n, j);
YAZ_CHECK(cp);
}
nmem_destroy(n);
YAZ_CHECK(cp);
}
nmem_destroy(n);
- nmem_exit();
}
int main (int argc, char **argv)
}
int main (int argc, char **argv)
@@
-59,6
+55,7
@@
int main (int argc, char **argv)
/*
* 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