cvs commit: apache-apr/apr/threadproc/unix Makefile proc.c

1999-05-10 Thread rbb
rbb 99/05/10 08:29:41

  Modified:apr/lib  Makefile.in
   apr/threadproc/unix Makefile proc.c
  Log:
  Second part of the big commit to change from apr_ to ap_.  I think this fixes
  the rest of the problems.
  
  Revision  ChangesPath
  1.6   +1 -1  apache-apr/apr/lib/Makefile.in
  
  Index: Makefile.in
  ===
  RCS file: /home/cvs/apache-apr/apr/lib/Makefile.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.in   1999/04/28 19:20:15 1.5
  +++ Makefile.in   1999/05/10 15:29:39 1.6
  @@ -9,7 +9,7 @@
   [EMAIL PROTECTED]@
   [EMAIL PROTECTED]@ $(LDLIBS)
   INCDIR=../include
  -INCLUDES=-I$(INCDIR)
  +INCLUDES=-I../../include -I$(INCDIR)
   
   LIB=libapr.a
   
  
  
  
  1.3   +1 -1  apache-apr/apr/threadproc/unix/Makefile
  
  Index: Makefile
  ===
  RCS file: /home/cvs/apache-apr/apr/threadproc/unix/Makefile,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile  1999/05/10 14:36:35 1.2
  +++ Makefile  1999/05/10 15:29:40 1.3
  @@ -47,7 +47,7 @@
   
   LIB=  libthreadproc.a
   
  -OBJS= proc.o thread.o threadcancel.o threadpriv.o 
  +OBJS= proc.o 
 
   .c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $<
  
  
  
  1.8   +1 -1  apache-apr/apr/threadproc/unix/proc.c
  
  Index: proc.c
  ===
  RCS file: /home/cvs/apache-apr/apr/threadproc/unix/proc.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- proc.c1999/05/10 14:36:36 1.7
  +++ proc.c1999/05/10 15:29:40 1.8
  @@ -183,7 +183,7 @@
   while (args[i]) {
   i++;
   }
  -newargs = (char **)apr_palloc(cont->pool, sizeof (char *) * (i + 
3));
  +newargs = (char **)ap_palloc(cont->pool, sizeof (char *) * (i + 
3));
   newargs[0] = strdup(SHELL_PATH);
   newargs[1] = strdup("-c");
   i = 0;
  
  
  


cvs commit: apache-apr/apr/threadproc/unix Makefile proc.c threadproc.h

1999-05-10 Thread rbb
rbb 99/05/10 07:36:36

  Modified:docs apr-function.txt fileio.txt impl.txt misc.txt
networkio.txt threadproc.txt time.txt
   apr/file_io/beos dir.c fileacc.c filedup.c filestat.c open.c
readwrite.c seek.c
   apr/file_io/os2 filedup.c filestat.c open.c readwrite.c
seek.c
   apr/file_io/unix dir.c fileacc.c filedup.c fileio.h
filestat.c open.c pipe.c readwrite.c seek.c
   apr/misc/unix start.c
   apr/network_io/beos select.c sendrecv.c sockets.c sockopt.c
   apr/network_io/unix networkio.h poll.c sendrecv.c sockets.c
sockopt.c
   apr/test Makefile ab_apr.c client.c server.c testfile.c
testproc.c testsock.c
   apr/threadproc/unix Makefile proc.c threadproc.h
  Log:
  This is a huge change.  It chagnes all of the "apr_" to "ap_".  It works
  fine on my system (test program included), but I will check it out after
  the commit to make sure it still works.
  
  Revision  ChangesPath
  1.7   +54 -54apache-apr/docs/apr-function.txt
  
  Index: apr-function.txt
  ===
  RCS file: /home/cvs/apache-apr/docs/apr-function.txt,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- apr-function.txt  1999/02/16 13:11:00 1.6
  +++ apr-function.txt  1999/05/10 14:36:17 1.7
  @@ -31,7 +31,7 @@
   
   - APR_MACROS_AND_MAYBE_CONSTANTS will have all letters capitalized, with
 underscore word separators.
  -- apr_variables_and_functions will have all letters in lower case with
  +- ap_variables_and_functions will have all letters in lower case with
 underscore word separators.
   - APRTypedefsAndStructsAndUnions will have the first letter of each word's
 first letter capitalized. 
  @@ -107,7 +107,7 @@
   * Note: We could also follow the ANSI C model, but this seems more
 appropriate.
   
  - APRStatus apr_open(char *, APRUInt32, APRFilePerms, APRFile)
  + APRStatus ap_open(char *, APRUInt32, APRFilePerms, APRFile)
Open the specified file, and return a method for accessing that file.
Arguments:
arg 1)  path name to the file to be opened.
  @@ -127,41 +127,41 @@
   work, but it will support the set of Unix permissions at
   minimum.
   arg 4) The abstracted file descriptor for the file that was opened.
  - APRStatus apr_close(APRFile);
  + APRStatus ap_close(APRFile);
Close the specified file descriptor
Arguments:
arg 1)  file descriptor of file to be closed.
  - APRStatus apr_read(APRFile, void *, APRUInt64, APRUInt64 *)
  + APRStatus ap_read(APRFile, void *, APRUInt64, APRUInt64 *)
Read n bytes from file and store in buffer.
Arguments:
arg 1)  File descriptor to read from
arg 2)  buffer to store data in
arg 3)  number of bytes to read
arg 4)  pointer to number of bytes read. (returned by APR)
  - APRStatus apr_write(APRFile, void *, APRUInt64, APRUInt64 *)
  + APRStatus ap_write(APRFile, void *, APRUInt64, APRUInt64 *)
Write n bytes of data from buffer to file
Arguments:
arg 1)  File descriptor to write data to
arg 2)  buffer to read data from
arg 3)  number of bytes to write
arg 4)  pointer to number of bytes written. (returned by APR)
  - APRStatus apr_writev(APRFile, APRIOVec *, APRUInt64, APUInt64 *)
  - Same as apr_write, except it gets the data from the APRIOVec array.
  + APRStatus ap_writev(APRFile, APRIOVec *, APRUInt64, APUInt64 *)
  + Same as ap_write, except it gets the data from the APRIOVec array.
Arguments:
arg 1)  File descriptor to write data to
arg 2)  Array from which to get the data to write to the file
arg 3)  Number of elements in the APRIOVec array.  Must be smaller
  - than apr_MAX_IOVEC_SIZE, if not function will fail with
  - apr_BUFFER_OVERFLOW_ERROR
  + than ap_MAX_IOVEC_SIZE, if not function will fail with
  + ap_BUFFER_OVERFLOW_ERROR
arg 4) number of bytes written.  APR_FAILURE on failure.
  - NOTES: apr_writev will write a complete entry from APRIOVec array before
  + NOTES: ap_writev will write a complete entry from APRIOVec array before
moving on to the next one.
  - APRStatus apr_getfileinfo(char *, APRFileInfo *)  
  + APRStatus ap_getfileinfo(char *, APRFileInfo *)  
Get information about the file with the given path name.
Arguments:
arg 1)  path to file to get information about
arg 2)  Structure to store file's information in. (Returned by APR)
  - APRStatus apr_seek(APRFile, APRInt64, APRSeekWhere, APRInt64 *)
  + APRStatus ap_seek(APRFile, APRInt64, APRSeekWhere, APRInt64 *)
Moves