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
RPM: simplify make install rule
[idzebra-moved-to-github.git]
/
bfile
/
bfile.c
diff --git
a/bfile/bfile.c
b/bfile/bfile.c
index
cf1e9db
..
33f856b
100644
(file)
--- a/
bfile/bfile.c
+++ b/
bfile/bfile.c
@@
-1,5
+1,5
@@
/* This file is part of the Zebra server.
/* This file is part of the Zebra server.
- Copyright (C) 1994-2009 Index Data
+ Copyright (C) 2004-2013 Index Data
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-17,6
+17,9
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-174,7
+177,7
@@
BFile bf_xopen(BFiles bfs, const char *name, int block_size, int wrflag,
bf->alloc_buf_size = HEADER_SIZE;
else
bf->alloc_buf_size = bf->block_size;
bf->alloc_buf_size = HEADER_SIZE;
else
bf->alloc_buf_size = bf->block_size;
-
+
hbuf = bf->alloc_buf = xmalloc(bf->alloc_buf_size);
/* fill-in default values */
hbuf = bf->alloc_buf = xmalloc(bf->alloc_buf_size);
/* fill-in default values */
@@
-240,7
+243,7
@@
int bf_xclose(BFile bf, int version, const char *more_info)
zint pos = 0;
assert(bf->alloc_buf);
assert(bf->magic);
zint pos = 0;
assert(bf->alloc_buf);
assert(bf->magic);
- sprintf(bf->alloc_buf, "%s %d " ZINT_FORMAT " " ZINT_FORMAT " ",
+ sprintf(bf->alloc_buf, "%s %d " ZINT_FORMAT " " ZINT_FORMAT " ",
bf->magic, version, bf->last_block, bf->free_list);
if (more_info)
strcat(bf->alloc_buf, more_info);
bf->magic, version, bf->last_block, bf->free_list);
if (more_info)
strcat(bf->alloc_buf, more_info);
@@
-334,7
+337,7
@@
int bf_read2(BFile bf, zint no, int offset, int nbytes, void *buf)
if ((ret = cf_read(bf->cf, no, offset, nbytes, buf)) == 0)
ret = mf_read(bf->mf, no, offset, nbytes, buf);
}
if ((ret = cf_read(bf->cf, no, offset, nbytes, buf)) == 0)
ret = mf_read(bf->mf, no, offset, nbytes, buf);
}
- else
+ else
ret = mf_read(bf->mf, no, offset, nbytes, buf);
zebra_lock_rdwr_runlock(&bf->rdwr_lock);
return ret;
ret = mf_read(bf->mf, no, offset, nbytes, buf);
zebra_lock_rdwr_runlock(&bf->rdwr_lock);
return ret;