manoj 99/10/11 23:14:47
Modified: src/lib/apr/file_io/os2 filedup.c open.c pipe.c
src/lib/apr/file_io/unix dir.c filedup.c open.c
src/lib/apr/file_io/win32 dir.c filedup.c
src/lib/apr/locks/beos crossproc.c intraproc.c
src/lib/apr/locks/unix crossproc.c intraproc.c
src/lib/apr/misc/win32 start.c
src/modules/mpm/winnt winnt.c
Log:
Make sure to use ap_null_cleanup instead of NULL when setting an empty
child_cleanup.
Revision Changes Path
1.3 +2 -1 apache-2.0/src/lib/apr/file_io/os2/filedup.c
Index: filedup.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/filedup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -u -r1.2 -r1.3
--- filedup.c 1999/10/04 16:36:47 1.2
+++ filedup.c 1999/10/12 06:14:40 1.3
@@ -83,6 +83,7 @@
dup_file->status = old_file->status;
dup_file->isopen = old_file->isopen;
*new_file = dup_file;
- ap_register_cleanup(dup_file->cntxt, dup_file, file_cleanup, NULL);
+ ap_register_cleanup(dup_file->cntxt, dup_file, file_cleanup,
+ ap_null_cleanup);
return APR_SUCCESS;
}
1.5 +1 -1 apache-2.0/src/lib/apr/file_io/os2/open.c
Index: open.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/open.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -u -r1.4 -r1.5
--- open.c 1999/10/11 14:51:22 1.4
+++ open.c 1999/10/12 06:14:40 1.5
@@ -128,7 +128,7 @@
dafile->isopen = TRUE;
dafile->fname = ap_pstrdup(cntxt, fname);
- ap_register_cleanup(dafile->cntxt, dafile, file_cleanup, NULL);
+ ap_register_cleanup(dafile->cntxt, dafile, file_cleanup,
ap_null_cleanup);
return APR_SUCCESS;
}
1.4 +2 -2 apache-2.0/src/lib/apr/file_io/os2/pipe.c
Index: pipe.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/pipe.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -u -r1.3 -r1.4
--- pipe.c 1999/10/06 23:03:44 1.3
+++ pipe.c 1999/10/12 06:14:41 1.4
@@ -75,14 +75,14 @@
(*in)->filedes = filedes[0];
(*in)->fname = ap_pstrdup(cont, "PIPE");
(*in)->isopen = TRUE;
- ap_register_cleanup(cont, *in, file_cleanup, NULL);
+ ap_register_cleanup(cont, *in, file_cleanup, ap_null_cleanup);
(*out) = (struct file_t *)ap_palloc(cont, sizeof(struct file_t));
(*out)->cntxt = cont;
(*out)->filedes = filedes[1];
(*out)->fname = ap_pstrdup(cont, "PIPE");
(*out)->isopen = TRUE;
- ap_register_cleanup(cont, *out, file_cleanup, NULL);
+ ap_register_cleanup(cont, *out, file_cleanup, ap_null_cleanup);
return APR_SUCCESS;
}
1.8 +2 -1 apache-2.0/src/lib/apr/file_io/unix/dir.c
Index: dir.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/dir.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -u -r1.7 -r1.8
--- dir.c 1999/10/06 23:03:46 1.7
+++ dir.c 1999/10/12 06:14:42 1.8
@@ -94,7 +94,8 @@
return errno;
}
else {
- ap_register_cleanup((*new)->cntxt, (void *)(*new), dir_cleanup,
NULL);
+ ap_register_cleanup((*new)->cntxt, (void *)(*new), dir_cleanup,
+ ap_null_cleanup);
return APR_SUCCESS;
}
}
1.4 +2 -1 apache-2.0/src/lib/apr/file_io/unix/filedup.c
Index: filedup.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/filedup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -u -r1.3 -r1.4
--- filedup.c 1999/10/04 16:36:50 1.3
+++ filedup.c 1999/10/12 06:14:42 1.4
@@ -104,7 +104,8 @@
(*new_file)->atime = old_file->atime;
(*new_file)->mtime = old_file->mtime;
(*new_file)->ctime = old_file->ctime;
- ap_register_cleanup((*new_file)->cntxt, (void *)(*new_file),
file_cleanup, NULL);
+ ap_register_cleanup((*new_file)->cntxt, (void *)(*new_file),
file_cleanup,
+ ap_null_cleanup);
return APR_SUCCESS;
}
1.15 +2 -1 apache-2.0/src/lib/apr/file_io/unix/open.c
Index: open.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/open.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -u -r1.14 -r1.15
--- open.c 1999/10/11 14:20:38 1.14
+++ open.c 1999/10/12 06:14:42 1.15
@@ -176,7 +176,8 @@
(*new)->stated = 0; /* we haven't called stat for this file yet. */
(*new)->eof_hit = 0;
- ap_register_cleanup((*new)->cntxt, (void *)(*new), file_cleanup, NULL);
+ ap_register_cleanup((*new)->cntxt, (void *)(*new), file_cleanup,
+ ap_null_cleanup);
return APR_SUCCESS;
}
1.5 +2 -1 apache-2.0/src/lib/apr/file_io/win32/dir.c
Index: dir.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/dir.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -u -r1.4 -r1.5
--- dir.c 1999/10/06 23:03:53 1.4
+++ dir.c 1999/10/12 06:14:43 1.5
@@ -98,7 +98,8 @@
(*new)->dirname = ap_pstrcat(cont, dirname, "/*", NULL);
}
(*new)->dirhand = INVALID_HANDLE_VALUE;
- ap_register_cleanup((*new)->cntxt, (void *)(*new), dir_cleanup, NULL);
+ ap_register_cleanup((*new)->cntxt, (void *)(*new), dir_cleanup,
+ ap_null_cleanup);
return APR_SUCCESS;
}
1.3 +2 -1 apache-2.0/src/lib/apr/file_io/win32/filedup.c
Index: filedup.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/filedup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -u -r1.2 -r1.3
--- filedup.c 1999/10/04 16:36:52 1.2
+++ filedup.c 1999/10/12 06:14:43 1.3
@@ -81,7 +81,8 @@
(*new_file)->atime = old_file->atime;
(*new_file)->mtime = old_file->mtime;
(*new_file)->ctime = old_file->ctime;
- ap_register_cleanup((*new_file)->cntxt, (void *)(*new_file),
file_cleanup, NULL);
+ ap_register_cleanup((*new_file)->cntxt, (void *)(*new_file),
file_cleanup,
+ ap_null_cleanup);
return APR_SUCCESS;
}
1.2 +2 -1 apache-2.0/src/lib/apr/locks/beos/crossproc.c
Index: crossproc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/crossproc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -u -r1.1 -r1.2
--- crossproc.c 1999/08/17 15:59:42 1.1
+++ crossproc.c 1999/10/12 06:14:44 1.2
@@ -79,7 +79,8 @@
return errno;
}
new->curr_locked == 0;
- ap_register_cleanup(new->cntxt, (void *)new, lock_inter_cleanup, NULL);
+ ap_register_cleanup(new->cntxt, (void *)new, lock_inter_cleanup,
+ ap_null_cleanup);
return APR_SUCCESS;
}
1.2 +2 -1 apache-2.0/src/lib/apr/locks/beos/intraproc.c
Index: intraproc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/intraproc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -u -r1.1 -r1.2
--- intraproc.c 1999/08/17 15:59:42 1.1
+++ intraproc.c 1999/10/12 06:14:44 1.2
@@ -86,7 +86,8 @@
}
new->sem_intraproc = stat;
new->curr_locked == 0;
- ap_register_cleanup(new->cntxt, (void *)new, lock_intra_cleanup, NULL);
+ ap_register_cleanup(new->cntxt, (void *)new, lock_intra_cleanup,
+ ap_null_cleanup);
return APR_SUCCESS;
}
1.7 +4 -4 apache-2.0/src/lib/apr/locks/unix/crossproc.c
Index: crossproc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/crossproc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -u -r1.6 -r1.7
--- crossproc.c 1999/10/11 22:39:39 1.6
+++ crossproc.c 1999/10/12 06:14:45 1.7
@@ -96,7 +96,7 @@
new->op_off.sem_flg = SEM_UNDO;
new->curr_locked == 0;
- ap_register_cleanup(new->cntxt, (void *)new, lock_cleanup, NULL);
+ ap_register_cleanup(new->cntxt, (void *)new, lock_cleanup,
ap_null_cleanup);
return APR_SUCCESS;
}
@@ -188,7 +188,7 @@
}
new->curr_locked == 0;
- ap_register_cleanup(new->cntxt, (void *)new, lock_cleanup, NULL);
+ ap_register_cleanup(new->cntxt, (void *)new, lock_cleanup,
ap_null_cleanup);
return APR_SUCCESS;
}
@@ -265,7 +265,7 @@
new->curr_locked=0;
unlink(new->fname);
- ap_register_cleanup(new->cntxt, new, lock_cleanup, NULL);
+ ap_register_cleanup(new->cntxt, new, lock_cleanup, ap_null_cleanup);
return APR_SUCCESS;
}
@@ -324,7 +324,7 @@
return errno;
}
new->curr_locked == 0;
- ap_register_cleanup(new->cntxt, (void *)new, lock_cleanup, NULL);
+ ap_register_cleanup(new->cntxt, (void *)new, lock_cleanup,
ap_null_cleanup);
return APR_SUCCESS;
}
1.3 +2 -1 apache-2.0/src/lib/apr/locks/unix/intraproc.c
Index: intraproc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/intraproc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -u -r1.2 -r1.3
--- intraproc.c 1999/10/12 05:54:00 1.2
+++ intraproc.c 1999/10/12 06:14:45 1.3
@@ -98,7 +98,8 @@
}
new->curr_locked = 0;
- ap_register_cleanup(new->cntxt, (void *)new, lock_intra_cleanup, NULL);
+ ap_register_cleanup(new->cntxt, (void *)new, lock_intra_cleanup,
+ ap_null_cleanup);
return APR_SUCCESS;
}
1.8 +1 -1 apache-2.0/src/lib/apr/misc/win32/start.c
Index: start.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/start.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -u -r1.7 -r1.8
--- start.c 1999/10/08 20:04:11 1.7
+++ start.c 1999/10/12 06:14:46 1.8
@@ -108,7 +108,7 @@
return APR_EEXIST;
}
- ap_register_cleanup(new, NULL, clean_cont, NULL);
+ ap_register_cleanup(new, NULL, clean_cont, ap_null_cleanup);
*newcont = new;
return APR_SUCCESS;
1.21 +1 -1 apache-2.0/src/modules/mpm/winnt/winnt.c
Index: winnt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -u -r1.20 -r1.21
--- winnt.c 1999/10/11 17:33:24 1.20
+++ winnt.c 1999/10/12 06:14:46 1.21
@@ -445,7 +445,7 @@
listenmaxfd = nsd;
}
}
-// ap_register_cleanup(p, (void *)lr->sd, socket_cleanup, NULL);
+// ap_register_cleanup(p, (void *)lr->sd, socket_cleanup,
ap_null_cleanup);
ap_put_os_sock(&lr->sd, &nsd, pconf);
lr->count = 0;
}
