symbol clash patch for INN-CURRENT and glibc
James Ralston
qralston+ml.inn-patches at andrew.cmu.edu
Sat May 12 01:30:23 UTC 2001
This patch renames all of INN's symbols that conflict with glibc when
-D_GNU_SOURCE is used.
It compiles cleanly for me, but I haven't tested running it.
--
James Ralston, Information Technology
Software Engineering Institute
Carnegie Mellon University, Pittsburgh, PA, USA
-- Attached file included as plaintext by Listar --
-- File: inn-CURRENT-glibc-gnu-source.patch
diff -U 2 -r -N ORIG/inn-CURRENT/backends/filechan.c inn-CURRENT/backends/filechan.c
--- ORIG/inn-CURRENT/backends/filechan.c Wed Oct 4 19:05:12 2000
+++ inn-CURRENT/backends/filechan.c Fri May 11 21:07:01 2001
@@ -127,5 +127,5 @@
if (fd >= 0) {
/* Try to lock it and set the ownership right. */
- lock_file(fd, LOCK_WRITE, TRUE);
+ inn_lock_file(fd, INN_LOCK_WRITE, TRUE);
if (myuid == 0 && uid != 0)
chown(p, uid, gid);
diff -U 2 -r -N ORIG/inn-CURRENT/backends/innxmit.c inn-CURRENT/backends/innxmit.c
--- ORIG/inn-CURRENT/backends/innxmit.c Sun Apr 22 23:05:14 2001
+++ inn-CURRENT/backends/innxmit.c Fri May 11 21:07:08 2001
@@ -1144,5 +1144,5 @@
exit(1);
}
- if (!lock_file(QIOfileno(BATCHqp), LOCK_WRITE, TRUE)) {
+ if (!inn_lock_file(QIOfileno(BATCHqp), INN_LOCK_WRITE, TRUE)) {
#if defined(EWOULDBLOCK)
if (errno == EWOULDBLOCK) {
diff -U 2 -r -N ORIG/inn-CURRENT/contrib/mlockfile.c inn-CURRENT/contrib/mlockfile.c
--- ORIG/inn-CURRENT/contrib/mlockfile.c Sun Mar 4 01:36:41 2001
+++ inn-CURRENT/contrib/mlockfile.c Fri May 11 21:06:52 2001
@@ -28,5 +28,5 @@
void
-lock_files(struct mlock *ml)
+inn_lock_files(struct mlock *ml)
{
int i;
@@ -111,5 +111,5 @@
/* loop over the list of paths, sleeping 60s between iterations */
for (;;) {
- lock_files(ml);
+ inn_lock_files(ml);
poll(NULL, 0, 60000);
}
diff -U 2 -r -N ORIG/inn-CURRENT/doc/man/libinn.3 inn-CURRENT/doc/man/libinn.3
--- ORIG/inn-CURRENT/doc/man/libinn.3 Wed Oct 4 21:05:10 2000
+++ inn-CURRENT/doc/man/libinn.3 Fri May 11 21:06:27 2001
@@ -68,5 +68,5 @@
.B "bool"
-.B "lock_file(fd, type, flag)"
+.B "inn_lock_file(fd, type, flag)"
.B " int fd;"
.B " LOCKTYPE type;"
@@ -301,5 +301,5 @@
It returns \-1 on failure or zero on success.
.PP
-.I lock_file
+.I inn_lock_file
tries to lock the file descriptor
.IR fd .
@@ -309,5 +309,5 @@
it will return FALSE if the file cannot be locked.
.I type
-is one of: LOCK_READ, LOCK_WRITE, or LOCK_UNLOCK.
+is one of: INN_LOCK_READ, INN_LOCK_WRITE, or INN_LOCK_UNLOCK.
It returns FALSE on failure or TRUE on success.
.PP
diff -U 2 -r -N ORIG/inn-CURRENT/include/libinn.h inn-CURRENT/include/libinn.h
--- ORIG/inn-CURRENT/include/libinn.h Sun Mar 11 08:06:04 2001
+++ inn-CURRENT/include/libinn.h Fri May 11 21:08:47 2001
@@ -134,13 +134,13 @@
** FILE LOCKING
*/
-enum locktype {
- LOCK_READ,
- LOCK_WRITE,
- LOCK_UNLOCK
+enum inn_locktype {
+ INN_LOCK_READ,
+ INN_LOCK_WRITE,
+ INN_LOCK_UNLOCK
};
-extern bool lock_file(int fd, enum locktype type, bool block);
-extern bool lock_range(int fd, enum locktype type, bool block,
- off_t offset, off_t size);
+extern bool inn_lock_file(int fd, enum inn_locktype type, bool block);
+extern bool inn_lock_range(int fd, enum inn_locktype type, bool block,
+ off_t offset, off_t size);
diff -U 2 -r -N ORIG/inn-CURRENT/lib/lockfile.c inn-CURRENT/lib/lockfile.c
--- ORIG/inn-CURRENT/lib/lockfile.c Mon Oct 2 17:05:18 2000
+++ inn-CURRENT/lib/lockfile.c Fri May 11 21:08:35 2001
@@ -3,7 +3,7 @@
** Lock a file or a range in a file.
**
-** Provides lock_file and lock_range functions to lock or unlock a file or
-** ranges within a file with a more convenient syntax than fcntl. Assume
-** that fcntl is available.
+** Provides inn_lock_file and inn_lock_range functions to lock or unlock a
+** file or ranges within a file with a more convenient syntax than fcntl.
+** Assume that fcntl is available.
*/
@@ -14,11 +14,11 @@
bool
-lock_file(int fd, enum locktype type, bool block)
+inn_lock_file(int fd, enum inn_locktype type, bool block)
{
- return lock_range(fd, type, block, 0, 0);
+ return inn_lock_range(fd, type, block, 0, 0);
}
bool
-lock_range(int fd, enum locktype type, bool block, off_t offset, off_t size)
+inn_lock_range(int fd, enum inn_locktype type, bool block, off_t offset, off_t size)
{
struct flock fl;
@@ -26,8 +26,8 @@
switch (type) {
- case LOCK_READ: fl.l_type = F_RDLCK; break;
- case LOCK_WRITE: fl.l_type = F_WRLCK; break;
+ case INN_LOCK_READ: fl.l_type = F_RDLCK; break;
+ case INN_LOCK_WRITE: fl.l_type = F_WRLCK; break;
default:
- case LOCK_UNLOCK: fl.l_type = F_UNLCK; break;
+ case INN_LOCK_UNLOCK: fl.l_type = F_UNLCK; break;
}
diff -U 2 -r -N ORIG/inn-CURRENT/storage/buffindexed/buffindexed.c inn-CURRENT/storage/buffindexed/buffindexed.c
--- ORIG/inn-CURRENT/storage/buffindexed/buffindexed.c Fri May 4 01:05:11 2001
+++ inn-CURRENT/storage/buffindexed/buffindexed.c Fri May 11 21:08:12 2001
@@ -247,6 +247,6 @@
static void GROUPLOCclear(GROUPLOC *loc);
static bool GROUPLOCempty(GROUPLOC loc);
-static bool GROUPlockhash(enum locktype type);
-static bool GROUPlock(GROUPLOC gloc, enum locktype type);
+static bool GROUPlockhash(enum inn_locktype type);
+static bool GROUPlock(GROUPLOC gloc, enum inn_locktype type);
static bool GROUPfilesize(int count);
static bool GROUPexpand(int mode);
@@ -525,6 +525,6 @@
}
-static bool ovlock(OVBUFF *ovbuff, enum locktype type) {
- return lock_range(ovbuff->fd, type, true, 0, sizeof(OVBUFFHEAD));
+static bool ovlock(OVBUFF *ovbuff, enum inn_locktype type) {
+ return inn_lock_range(ovbuff->fd, type, true, 0, sizeof(OVBUFFHEAD));
}
@@ -559,5 +559,5 @@
}
rpx = (OVBUFFHEAD *)ovbuff->bitfield;
- ovlock(ovbuff, LOCK_WRITE);
+ ovlock(ovbuff, INN_LOCK_WRITE);
if (strncmp(rpx->magic, OVBUFF_MAGIC, strlen(OVBUFF_MAGIC)) == 0) {
ovbuff->magicver = 1;
@@ -573,5 +573,5 @@
syslog(L_ERROR, "%s: Mismatch: index '%d' for buffindexed %s",
LocalLogName, i, ovbuff->path);
- ovlock(ovbuff, LOCK_UNLOCK);
+ ovlock(ovbuff, INN_LOCK_UNLOCK);
return FALSE;
}
@@ -582,5 +582,5 @@
syslog(L_ERROR, "%s: Mismatch: read 0x%s length for buffindexed %s",
LocalLogName, offt2hex(tmpo, FALSE), ovbuff->path);
- ovlock(ovbuff, LOCK_UNLOCK);
+ ovlock(ovbuff, INN_LOCK_UNLOCK);
return FALSE;
}
@@ -601,5 +601,5 @@
syslog(L_ERROR, "%s: too small length '%d' for buffindexed %s",
LocalLogName, ovbuff->len, ovbuff->path);
- ovlock(ovbuff, LOCK_UNLOCK);
+ ovlock(ovbuff, INN_LOCK_UNLOCK);
return FALSE;
}
@@ -618,5 +618,5 @@
memset(ovbuff->trace, '\0', sizeof(struct ov_trace_array) * ovbuff->totalblk);
#endif /* OV_DEBUG */
- ovlock(ovbuff, LOCK_UNLOCK);
+ ovlock(ovbuff, INN_LOCK_UNLOCK);
}
return TRUE;
@@ -727,5 +727,5 @@
ovbuffnext = ovbufftab;
for (ovbuff = ovbuffnext ; ovbuff != (OVBUFF *)NULL ; ovbuff = ovbuff->next) {
- ovlock(ovbuff, LOCK_WRITE);
+ ovlock(ovbuff, INN_LOCK_WRITE);
ovreadhead(ovbuff);
if (ovbuff->totalblk != ovbuff->usedblk && ovbuff->freeblk == ovbuff->totalblk) {
@@ -734,5 +734,5 @@
if (ovbuff->totalblk == ovbuff->usedblk || ovbuff->freeblk == ovbuff->totalblk) {
/* no space left for this ovbuff */
- ovlock(ovbuff, LOCK_UNLOCK);
+ ovlock(ovbuff, INN_LOCK_UNLOCK);
continue;
}
@@ -741,9 +741,9 @@
if (ovbuff == NULL) {
for (ovbuff = ovbufftab ; ovbuff != ovbuffnext ; ovbuff = ovbuff->next) {
- ovlock(ovbuff, LOCK_WRITE);
+ ovlock(ovbuff, INN_LOCK_WRITE);
ovreadhead(ovbuff);
if (ovbuff->totalblk == ovbuff->usedblk || ovbuff->freeblk == ovbuff->totalblk) {
/* no space left for this ovbuff */
- ovlock(ovbuff, LOCK_UNLOCK);
+ ovlock(ovbuff, INN_LOCK_UNLOCK);
continue;
}
@@ -785,5 +785,5 @@
ovbuff->needflush = TRUE;
ovflushhead(ovbuff);
- ovlock(ovbuff, LOCK_UNLOCK);
+ ovlock(ovbuff, INN_LOCK_UNLOCK);
ovbuffnext = ovbuff->next;
if (ovbuffnext == NULL)
@@ -807,5 +807,5 @@
if ((ovbuff = getovbuff(ov)) == NULL)
return;
- ovlock(ovbuff, LOCK_WRITE);
+ ovlock(ovbuff, INN_LOCK_WRITE);
#ifdef OV_DEBUG
recno = ((char *)ge - (char *)&GROUPentries[0])/sizeof(GROUPENTRY);
@@ -839,5 +839,5 @@
ovbuff->needflush = TRUE;
ovflushhead(ovbuff);
- ovlock(ovbuff, LOCK_UNLOCK);
+ ovlock(ovbuff, INN_LOCK_UNLOCK);
return;
}
@@ -974,5 +974,5 @@
return FALSE;
}
- GROUPlock(gloc, LOCK_READ);
+ GROUPlock(gloc, INN_LOCK_READ);
if (lo != NULL)
*lo = GROUPentries[gloc.recno].low;
@@ -983,5 +983,5 @@
if (flag != NULL)
*flag = GROUPentries[gloc.recno].flag;
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
return TRUE;
}
@@ -1023,5 +1023,5 @@
memcpy(&i, &grouphash, sizeof(i));
i = i % GROUPHEADERHASHSIZE;
- GROUPlockhash(LOCK_WRITE);
+ GROUPlockhash(INN_LOCK_WRITE);
gloc = GROUPnewnode();
ge = &GROUPentries[gloc.recno];
@@ -1040,5 +1040,5 @@
}
#endif /* OV_DEBUG */
- GROUPlockhash(LOCK_UNLOCK);
+ GROUPlockhash(INN_LOCK_UNLOCK);
return TRUE;
}
@@ -1151,9 +1151,9 @@
return TRUE;
}
- GROUPlock(gloc, LOCK_WRITE);
+ GROUPlock(gloc, INN_LOCK_WRITE);
ge = &GROUPentries[gloc.recno];
ge->deleted = time(NULL);
HashClear(&ge->hash);
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
return TRUE;
}
@@ -1167,10 +1167,10 @@
}
-static bool GROUPlockhash(enum locktype type) {
- return lock_range(GROUPfd, type, true, 0, sizeof(GROUPHEADER));
+static bool GROUPlockhash(enum inn_locktype type) {
+ return inn_lock_range(GROUPfd, type, true, 0, sizeof(GROUPHEADER));
}
-static bool GROUPlock(GROUPLOC gloc, enum locktype type) {
- return lock_range(GROUPfd,
+static bool GROUPlock(GROUPLOC gloc, enum inn_locktype type) {
+ return inn_lock_range(GROUPfd,
type,
true,
@@ -1396,9 +1396,9 @@
return TRUE;
}
- GROUPlock(gloc, LOCK_WRITE);
+ GROUPlock(gloc, INN_LOCK_WRITE);
/* prepend block(s) if needed. */
ge = &GROUPentries[gloc.recno];
if (Cutofflow && ge->low > artnum) {
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
return TRUE;
}
@@ -1409,5 +1409,5 @@
#endif /* OV_DEBUG */
if (Nospace) {
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
syslog(L_ERROR, "%s: no space left for buffer, adding '%s'", LocalLogName, group);
return FALSE;
@@ -1415,5 +1415,5 @@
syslog(L_ERROR, "%s: could not add overview for '%s'", LocalLogName, group);
}
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
return TRUE;
@@ -1665,7 +1665,7 @@
return NULL;
}
- GROUPlock(gloc, LOCK_WRITE);
+ GROUPlock(gloc, INN_LOCK_WRITE);
if ((handle = ovopensearch(group, low, high, TRUE)) == NULL)
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
return(handle);
}
@@ -1808,5 +1808,5 @@
gloc = search->gloc;
ovclosesearch(handle, FALSE);
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
}
@@ -1880,8 +1880,8 @@
return FALSE;
}
- GROUPlock(gloc, LOCK_WRITE);
+ GROUPlock(gloc, INN_LOCK_WRITE);
if ((Cachesearch != NULL) && (GROUPentries[gloc.recno].count == Cachesearch->count)) {
/* no new overview data is stored */
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
return FALSE;
} else {
@@ -1903,13 +1903,13 @@
return FALSE;
}
- GROUPlock(gloc, LOCK_WRITE);
+ GROUPlock(gloc, INN_LOCK_WRITE);
}
if (!(handle = ovopensearch(group, artnum, artnum, FALSE))) {
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
return FALSE;
}
retval = buffindexed_search(handle, NULL, data, len, token, NULL);
ovclosesearch(handle, FALSE);
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
return retval;
}
@@ -1931,12 +1931,12 @@
for (i = 0 ; i < GROUPheader->freelist.recno ; i++) {
gloc.recno = i;
- GROUPlock(gloc, LOCK_WRITE);
+ GROUPlock(gloc, INN_LOCK_WRITE);
ge = &GROUPentries[gloc.recno];
if (ge->expired >= OVrealnow || ge->count == 0) {
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
continue;
}
if (!ovgroupmmap(ge, ge->low, ge->high, TRUE)) {
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
syslog(L_ERROR, "%s: could not mmap overview for hidden groups(%d)", LocalLogName, i);
continue;
@@ -1952,5 +1952,5 @@
ge->expired = time(NULL);
ge->count = 0;
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
}
return TRUE;
@@ -1960,5 +1960,5 @@
return FALSE;
}
- GROUPlock(gloc, LOCK_WRITE);
+ GROUPlock(gloc, INN_LOCK_WRITE);
ge = &GROUPentries[gloc.recno];
if (ge->count == 0) {
@@ -1966,5 +1966,5 @@
*lo = ge->low;
ge->expired = time(NULL);
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
return TRUE;
}
@@ -1979,5 +1979,5 @@
if ((handle = ovopensearch(group, low, high, TRUE)) == NULL) {
ge->expired = time(NULL);
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
syslog(L_ERROR, "%s: could not open overview for '%s'", LocalLogName, group);
return FALSE;
@@ -2004,5 +2004,5 @@
ovclosesearch(handle, TRUE);
ge->expired = time(NULL);
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
syslog(L_ERROR, "%s: could not add new overview for '%s'", LocalLogName, group);
return FALSE;
@@ -2022,5 +2022,5 @@
ovclosesearch(handle, TRUE);
ge->expired = time(NULL);
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
return TRUE;
}
@@ -2036,9 +2036,9 @@
case OVSPACE:
for (total = used = 0 ; ovbuff != (OVBUFF *)NULL ; ovbuff = ovbuff->next) {
- ovlock(ovbuff, LOCK_READ);
+ ovlock(ovbuff, INN_LOCK_READ);
ovreadhead(ovbuff);
total += ovbuff->totalblk;
used += ovbuff->usedblk;
- ovlock(ovbuff, LOCK_UNLOCK);
+ ovlock(ovbuff, INN_LOCK_UNLOCK);
}
i = (int *)val;
@@ -2215,10 +2215,10 @@
fprintf(stdout, "left articles are %d for %d, last expiry is %d\n", ge->count, gloc.recno, ge->expired);
if (ge->count == 0) {
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
exit(0);
}
if (!ovgroupmmap(ge, ge->low, ge->high, TRUE)) {
fprintf(stderr, "ovgroupmmap failed\n");
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
}
for (giblist = Giblist, i = 0 ; giblist != NULL ; giblist = giblist->next, i++);
@@ -2238,5 +2238,5 @@
}
ovgroupunmap();
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
exit(0);
}
@@ -2245,5 +2245,5 @@
fprintf(stderr, "gloc is null\n");
}
- GROUPlock(gloc, LOCK_READ);
+ GROUPlock(gloc, INN_LOCK_READ);
ge = &GROUPentries[gloc.recno];
fprintf(stdout, "base %d(%d), cur %d(%d), expired at %s\n", ge->baseindex.blocknum, ge->baseindex.index, ge->curindex.blocknum, ge->curindex.index, ge->expired == 0 ? "none\n" : ctime(&ge->expired));
diff -U 2 -r -N ORIG/inn-CURRENT/storage/ov3/ov3.c inn-CURRENT/storage/ov3/ov3.c
--- ORIG/inn-CURRENT/storage/ov3/ov3.c Mon Apr 23 01:05:12 2001
+++ inn-CURRENT/storage/ov3/ov3.c Fri May 11 21:07:51 2001
@@ -133,6 +133,6 @@
static void GROUPLOCclear(GROUPLOC *loc);
static bool GROUPLOCempty(GROUPLOC loc);
-static bool GROUPlockhash(enum locktype type);
-static bool GROUPlock(GROUPLOC gloc, enum locktype type);
+static bool GROUPlockhash(enum inn_locktype type);
+static bool GROUPlock(GROUPLOC gloc, enum inn_locktype type);
static bool GROUPfilesize(int count);
static bool GROUPexpand(int mode);
@@ -293,5 +293,5 @@
memcpy(&i, &grouphash, sizeof(i));
i = i % GROUPHEADERHASHSIZE;
- GROUPlockhash(LOCK_WRITE);
+ GROUPlockhash(INN_LOCK_WRITE);
loc = GROUPnewnode();
ge = &GROUPentries[loc.recno];
@@ -304,5 +304,5 @@
ge->next = GROUPheader->hash[i];
GROUPheader->hash[i] = loc;
- GROUPlockhash(LOCK_UNLOCK);
+ GROUPlockhash(INN_LOCK_UNLOCK);
return TRUE;
}
@@ -479,14 +479,14 @@
}
-static bool GROUPlockhash(enum locktype type) {
- return lock_range(GROUPfd, type, true, 0, sizeof(GROUPHEADER));
+static bool GROUPlockhash(enum inn_locktype type) {
+ return inn_lock_range(GROUPfd, type, true, 0, sizeof(GROUPHEADER));
}
-static bool GROUPlock(GROUPLOC gloc, enum locktype type) {
- return lock_range(GROUPfd,
- type,
- true,
- sizeof(GROUPHEADER) + (sizeof(GROUPENTRY) * gloc.recno),
- sizeof(GROUPENTRY));
+static bool GROUPlock(GROUPLOC gloc, enum inn_locktype type) {
+ return inn_lock_range(GROUPfd,
+ type,
+ true,
+ sizeof(GROUPHEADER) + (sizeof(GROUPENTRY) * gloc.recno),
+ sizeof(GROUPENTRY));
}
@@ -861,7 +861,7 @@
return FALSE;
}
- GROUPlock(gh->gloc, LOCK_WRITE);
+ GROUPlock(gh->gloc, INN_LOCK_WRITE);
OV3addrec(ge, gh, artnum, token, data, len, arrived, expires);
- GROUPlock(gh->gloc, LOCK_UNLOCK);
+ GROUPlock(gh->gloc, INN_LOCK_UNLOCK);
OV3closegroup(gh, TRUE);
@@ -1051,5 +1051,5 @@
syslog(L_NOTICE, "tradindexed: repacking group %s, offset %d", group, delta);
- GROUPlock(gloc, LOCK_WRITE);
+ GROUPlock(gloc, INN_LOCK_WRITE);
if (delta > ge->base) delta = ge->base;
@@ -1067,10 +1067,10 @@
/* open and mmap old group index */
if ((gh = OV3opengroup(group, FALSE)) == NULL) {
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
return FALSE;
}
if (!OV3mmapgroup(gh)) {
OV3closegroup(gh, FALSE);
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
return FALSE;
}
@@ -1079,5 +1079,5 @@
syslog(L_ERROR, "tradindexed: could not open %s: %m", newidx);
OV3closegroup(gh, FALSE);
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
return FALSE;
}
@@ -1088,5 +1088,5 @@
close(fd);
OV3closegroup(gh, FALSE);
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
return FALSE;
}
@@ -1110,5 +1110,5 @@
close(fd);
OV3closegroup(gh, FALSE);
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
return FALSE;
}
@@ -1116,5 +1116,5 @@
syslog(L_ERROR, "tradindexed: packgroup cant close %s: %m", newidx);
OV3closegroup(gh, FALSE);
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
return FALSE;
}
@@ -1140,5 +1140,5 @@
ge->indexinode = sb.st_ino;
ge->base -= delta;
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
OV3closegroup(gh, FALSE);
return TRUE;
@@ -1189,11 +1189,11 @@
unlink(newdat);
- GROUPlock(gloc, LOCK_WRITE);
+ GROUPlock(gloc, INN_LOCK_WRITE);
if ((handle = tradindexed_opensearch(group, ge->low, ge->high)) == NULL) {
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
return FALSE;
}
if ((newgh = OV3opengroupfiles(newgroup)) == NULL) {
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
tradindexed_closesearch(handle);
return FALSE;
@@ -1261,5 +1261,5 @@
*lo = ge->low;
}
- GROUPlock(gloc, LOCK_UNLOCK);
+ GROUPlock(gloc, INN_LOCK_UNLOCK);
tradindexed_closesearch(handle);
OV3closegroupfiles(newgh);
diff -U 2 -r -N ORIG/inn-CURRENT/storage/ovdb/ovdb.c inn-CURRENT/storage/ovdb/ovdb.c
--- ORIG/inn-CURRENT/storage/ovdb/ovdb.c Tue Dec 12 16:05:13 2000
+++ inn-CURRENT/storage/ovdb/ovdb.c Fri May 11 21:05:26 2001
@@ -1102,5 +1102,5 @@
}
if(mode == OVDB_LOCK_EXCLUSIVE) {
- if(!lock_file(lockfd, LOCK_WRITE, FALSE)) {
+ if(!inn_lock_file(lockfd, INN_LOCK_WRITE, FALSE)) {
close(lockfd);
lockfd = -1;
@@ -1109,5 +1109,5 @@
return TRUE;
} else {
- if(!lock_file(lockfd, LOCK_READ, FALSE)) {
+ if(!inn_lock_file(lockfd, INN_LOCK_READ, FALSE)) {
close(lockfd);
lockfd = -1;
@@ -1123,5 +1123,5 @@
if(lockfd == -1)
return TRUE;
- r = lock_file(lockfd, LOCK_UNLOCK, FALSE);
+ r = inn_lock_file(lockfd, INN_LOCK_UNLOCK, FALSE);
close(lockfd);
lockfd = -1;
diff -U 2 -r -N ORIG/inn-CURRENT/storage/timecaf/caf.c inn-CURRENT/storage/timecaf/caf.c
--- ORIG/inn-CURRENT/storage/timecaf/caf.c Wed Oct 4 21:05:21 2000
+++ inn-CURRENT/storage/timecaf/caf.c Fri May 11 21:05:17 2001
@@ -763,5 +763,5 @@
/* shouldn't be anyone else locking our file, since temp file has unique
PID-based name ... */
- if (!lock_file(fd, LOCK_WRITE, FALSE)) {
+ if (!inn_lock_file(fd, INN_LOCK_WRITE, FALSE)) {
CAFError(CAF_ERR_IO);
(void) close(fd);
@@ -856,5 +856,5 @@
/* try a nonblocking lock attempt first. */
- if (lock_file(fd, LOCK_WRITE, FALSE)) break;
+ if (inn_lock_file(fd, INN_LOCK_WRITE, FALSE)) break;
if (!waitlock) {
@@ -864,5 +864,5 @@
}
/* wait around to try and get a lock. */
- (void) lock_file(fd, LOCK_WRITE, TRUE);
+ (void) inn_lock_file(fd, INN_LOCK_WRITE, TRUE);
/*
** and then close and reopen the file, in case someone changed the
@@ -1237,8 +1237,8 @@
}
/* try a nonblocking lock attempt first. */
- if (lock_file(fd, LOCK_WRITE, FALSE)) break;
+ if (inn_lock_file(fd, INN_LOCK_WRITE, FALSE)) break;
/* wait around to try and get a lock. */
- (void) lock_file(fd, LOCK_WRITE, TRUE);
+ (void) inn_lock_file(fd, INN_LOCK_WRITE, TRUE);
/*
** and then close and reopen the file, in case someone changed the
@@ -1465,8 +1465,8 @@
/* try a nonblocking lock attempt first. */
- if (lock_file(fdin, LOCK_WRITE, FALSE)) break;
+ if (inn_lock_file(fdin, INN_LOCK_WRITE, FALSE)) break;
/* wait around to try and get a lock. */
- (void) lock_file(fdin, LOCK_WRITE, TRUE);
+ (void) inn_lock_file(fdin, INN_LOCK_WRITE, TRUE);
/*
** and then close and reopen the file, in case someone changed the
More information about the inn-patches
mailing list