You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bj...@locus.apache.org on 2000/03/03 15:57:01 UTC
cvs commit: apache-2.0/src/lib/apr/file_io/os2 filedup.c fileio.h open.c pipe.c
bjh 00/03/03 06:57:01
Modified: src/lib/apr/file_io/os2 filedup.c fileio.h open.c pipe.c
Log:
OS/2: file_cleanup() should be namespace protected as it's not static.
Revision Changes Path
1.7 +1 -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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- filedup.c 2000/01/10 15:35:45 1.6
+++ filedup.c 2000/03/03 14:57:00 1.7
@@ -91,7 +91,7 @@
dup_file->flags = old_file->flags;
if (*new_file == NULL) {
- ap_register_cleanup(dup_file->cntxt, dup_file, file_cleanup,
+ ap_register_cleanup(dup_file->cntxt, dup_file, apr_file_cleanup,
ap_null_cleanup);
*new_file = dup_file;
}
1.9 +1 -1 apache-2.0/src/lib/apr/file_io/os2/fileio.h
Index: fileio.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/fileio.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fileio.h 2000/02/21 16:41:39 1.8
+++ fileio.h 2000/03/03 14:57:00 1.9
@@ -91,7 +91,7 @@
int validentry;
};
-ap_status_t file_cleanup(void *);
+ap_status_t apr_file_cleanup(void *);
ap_status_t ap_os2_time_to_ap_time(ap_time_t *result, FDATE os2date, FTIME os2time);
int os2errno( ULONG oserror );
1.15 +2 -2 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- open.c 2000/01/10 15:35:45 1.14
+++ open.c 2000/03/03 14:57:00 1.15
@@ -62,7 +62,7 @@
#define INCL_DOS
#include <os2.h>
-ap_status_t file_cleanup(void *thefile)
+ap_status_t apr_file_cleanup(void *thefile)
{
struct file_t *file = thefile;
return ap_close(file);
@@ -140,7 +140,7 @@
if (dafile->buffered)
dafile->buffer = ap_palloc(cntxt, APR_FILE_BUFSIZE);
- ap_register_cleanup(dafile->cntxt, dafile, file_cleanup, ap_null_cleanup);
+ ap_register_cleanup(dafile->cntxt, dafile, apr_file_cleanup, ap_null_cleanup);
return APR_SUCCESS;
}
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pipe.c 2000/01/10 14:21:54 1.6
+++ pipe.c 2000/03/03 14:57:00 1.7
@@ -77,7 +77,7 @@
(*in)->isopen = TRUE;
(*in)->buffered = FALSE;
(*in)->flags = 0;
- ap_register_cleanup(cont, *in, file_cleanup, ap_null_cleanup);
+ ap_register_cleanup(cont, *in, apr_file_cleanup, ap_null_cleanup);
(*out) = (struct file_t *)ap_palloc(cont, sizeof(struct file_t));
(*out)->cntxt = cont;
@@ -86,7 +86,7 @@
(*out)->isopen = TRUE;
(*out)->buffered = FALSE;
(*out)->flags = 0;
- ap_register_cleanup(cont, *out, file_cleanup, ap_null_cleanup);
+ ap_register_cleanup(cont, *out, apr_file_cleanup, ap_null_cleanup);
return APR_SUCCESS;
}
Re: cvs commit: apache-2.0/src/lib/apr/file_io/os2 filedup.c fileio.h open.c pipe.c
Posted by Brian Havard <br...@kheldar.apana.org.au>.
On Fri, 3 Mar 2000 22:42:10 -0500 (EST), rbb@apache.org wrote:
>On 3 Mar 2000 bjh@locus.apache.org wrote:
>
>> bjh 00/03/03 06:57:01
>>
>> Modified: src/lib/apr/file_io/os2 filedup.c fileio.h open.c pipe.c
>> Log:
>> OS/2: file_cleanup() should be namespace protected as it's not static.
>
>In general, I agree with this, but the decision was made that apr
>functions should have the ap_ prefix, not apr_.
Well, I figured that it's internal to apr so using apr_ was a good way
to indicate this. If that's not liked I'm happy to change it.
--
______________________________________________________________________________
| Brian Havard | "He is not the messiah! |
| brianh@kheldar.apana.org.au | He's a very naughty boy!" - Life of Brian |
------------------------------------------------------------------------------
Re: cvs commit: apache-2.0/src/lib/apr/file_io/os2 filedup.c fileio.h
open.c pipe.c
Posted by rb...@apache.org.
On 3 Mar 2000 bjh@locus.apache.org wrote:
> bjh 00/03/03 06:57:01
>
> Modified: src/lib/apr/file_io/os2 filedup.c fileio.h open.c pipe.c
> Log:
> OS/2: file_cleanup() should be namespace protected as it's not static.
In general, I agree with this, but the decision was made that apr
functions should have the ap_ prefix, not apr_.
Ryan
Re: cvs commit: apache-2.0/src/lib/apr/file_io/os2 filedup.c fileio.h
open.c pipe.c
Posted by rb...@apache.org.
On 3 Mar 2000 bjh@locus.apache.org wrote:
> bjh 00/03/03 06:57:01
>
> Modified: src/lib/apr/file_io/os2 filedup.c fileio.h open.c pipe.c
> Log:
> OS/2: file_cleanup() should be namespace protected as it's not static.
In general, I agree with this, but the decision was made that apr
functions should have the ap_ prefix, not apr_.
Ryan