Wed Jul 12 16:10:39 2000 John Heitmann <jwh1@cs.wustl.edu>

8 files changed, 38 insertions, 94 deletions

diff --git a/PACE/ChangeLog b/PACE/ChangeLog
index aecafd594aa..dc68c6000b9 100644
--- a/PACE/ChangeLog
+++ b/PACE/ChangeLog
@@ -1,3 +1,15 @@
+Wed Jul 12 16:10:39 2000  John Heitmann  <jwh1@cs.wustl.edu>
+
+	* pace/fcntl.h
+	* pace/mqueue.h
+	* pace/semaphore.h
+	* pace/stdio.h
+	* pace/unistd.h
+	* pace/unistd.inl
+	* pace/tests/mqueue_test.c
+	  Updated all #define pace_func (X) macros to remove the need
+	  for double paranthesis.
+
 Wed Jul 12 17:01:47 2000  Ossama Othman  <ossama@uci.edu>
 
 	* Makefile.am:
@@ -11,7 +23,7 @@ Wed Jul 12 17:01:47 2000  Ossama Othman  <ossama@uci.edu>
 Wed Jul 12 15:27:27 2000  Luther J Baker  <luther@cs.wustl.edu>
 
 	* pace/posix/types.h (PACE_TCHAR):
-	* pace/win32/types.h (PACE_TCHAR):	
+	* pace/win32/types.h (PACE_TCHAR):
 
 	  Added typedef char PACE_TCHAR;
 	  Protected some of the typedefs.
@@ -25,8 +37,8 @@ Wed Jul 12 14:26:10 2000  Luther J Baker  <luther@cs.wustl.edu>
 
 Wed Jul 12 14:15:10 2000  Luther J Baker  <luther@cs.wustl.edu>
 
-	* pace/win32/signal.h: 
-	* pace/win32/time.h: 
+	* pace/win32/signal.h:
+	* pace/win32/time.h:
 
 	  Added types to help win32 along.
 
@@ -38,8 +50,8 @@ Wed Jul 12 11:51:52 2000  Luther J Baker  <luther@cs.wustl.edu>
 
 	* pace/win32/errno.h:
 
-	  Added to repository.	
-	
+	  Added to repository.
+
 	* pace/win32/pace_dll.dsp:
 	* pace/win32/pace_lib.dsp:
 
diff --git a/PACE/pace/fcntl.h b/PACE/pace/fcntl.h
index d4737936323..0ac4f2b3e96 100644
--- a/PACE/pace/fcntl.h
+++ b/PACE/pace/fcntl.h
@@ -42,26 +42,16 @@ extern "C" {
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 6.5.2.
    */
-  # define pace_fcntl(X) fcntl X
-  /* int fcntl (int fildes, int cmd, *//* arg *//* ... );
-   *
-   * PLEASE PAY SPECIAL ATTENTION HERE!
-   * This is a macro and requires an additional set of parenthesis
-   * surrounding the arguments.
-   */
+  # define pace_fcntl fcntl
+  /* int fcntl (int fildes, int cmd, *//* arg *//* ... ); */
 
   /**
      PACE's implementation of the POSIX function open.
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 5.3.1.
    */
-  # define pace_open(X) open X
-  /* int open (const char *path, int oflag, *//* pace_mode_t mode *//* ... );
-   *
-   * PLEASE PAY SPECIAL ATTENTION HERE!
-   * This is a macro and requires an additional set of parenthesis
-   * surrounding the arguments.
-   */
+  # define pace_open open
+  /* int open (const char *path, int oflag, *//* pace_mode_t mode *//* ... );*/
 
 #if defined (PACE_HAS_CPLUSPLUS)
 }
diff --git a/PACE/pace/mqueue.h b/PACE/pace/mqueue.h
index 18c8c3a4b06..07a47dd19f8 100644
--- a/PACE/pace/mqueue.h
+++ b/PACE/pace/mqueue.h
@@ -59,13 +59,8 @@ extern "C" {
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 15.2.1.
    */
-  # define pace_mq_open(X) mq_open X
-  /* mqd_t mq_open (const char *name, int oflag, (*//* args *//*) ... );
-   *
-   * PLEASE PAY SPECIAL ATTENTION HERE!
-   * This is a macro and requires an additional set of parenthesis
-   * surrounding the arguments.
-   */
+  # define pace_mq_open mq_open
+  /* mqd_t mq_open (const char *name, int oflag, (*//* args *//*) ... ); */
 
   /**
      PACE's implementation of the POSIX function mq_receive.
diff --git a/PACE/pace/posix/unistd.inl b/PACE/pace/posix/unistd.inl
index fbb5ce6b403..19b0f2001f8 100644
--- a/PACE/pace/posix/unistd.inl
+++ b/PACE/pace/posix/unistd.inl
@@ -82,18 +82,6 @@ pace_execv (const char * path,
   /* if successful, this operation does NOT return */
 }
 
-PACE_BROKEN_INLINE
-int
-pace_execl (const char* path, const char* arg, ...)
-{
-  int result = 0;
-  va_list ap;
-  va_start (ap, arg);
-  result = pace_execv (path, (char*const*)ap);
-  va_end (ap);
-  return result;
-}
-
 PACE_INLINE
 int
 pace_execve (const char * path,
@@ -104,18 +92,6 @@ pace_execve (const char * path,
   /* if successful, this operation does NOT return */
 }
 
-PACE_BROKEN_INLINE
-int
-pace_execle (const char* path, const char* arg, ...)
-{
-  int result = 0;
-  va_list ap;
-  va_start (ap, arg);
-  result = pace_execve (path, (char*const*)ap, 0);
-  va_end (ap);
-  return result;
-}
-
 PACE_INLINE
 int
 pace_execvp (const char * file,
@@ -125,18 +101,6 @@ pace_execvp (const char * file,
   /* if successful, this operation does NOT return */
 }
 
-PACE_BROKEN_INLINE
-int
-pace_execlp (const char* file, const char* arg,  ...)
-{
-  int result = 0;
-  va_list ap;
-  va_start (ap, arg);
-  result = pace_execvp (file, (char*const*)ap);
-  va_end (ap);
-  return result;
-}
-
 PACE_INLINE
 int
 pace_fdatasync (int fildes)
diff --git a/PACE/pace/semaphore.h b/PACE/pace/semaphore.h
index 67554909b68..b8bc37c0f39 100644
--- a/PACE/pace/semaphore.h
+++ b/PACE/pace/semaphore.h
@@ -63,13 +63,8 @@ extern "C" {
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 11.2.3.
    */
-  # define pace_sem_open(X) sem_open X
-  /* int fprintf (FILE *stream, const char *format, (*//* args *//*) ... );
-   *
-   * PLEASE PAY SPECIAL ATTENTION HERE!
-   * This is a macro and requires an additional set of parenthesis
-   * surrounding the arguments.
-   */
+  # define pace_sem_open sem_open
+  /* int fprintf (FILE *stream, const char *format, (*//* args *//*) ... ); */
 
   /**
      PACE's implementation of the POSIX function sem_post.
diff --git a/PACE/pace/stdio.h b/PACE/pace/stdio.h
index 573d5c1d350..a2c145f6b3e 100644
--- a/PACE/pace/stdio.h
+++ b/PACE/pace/stdio.h
@@ -166,13 +166,8 @@ extern "C" {
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 8.1.
      */
-  #define pace_fscanf (X) fscanf X
-  /* int pace_scanf (const char *format, ... );
-  *
-  * PLEASE PAY SPECIAL ATTENTION HERE!
-  * This is a macro and requires an additional set of parenthesis
-  * surrounding the arguments.
-  */
+  #define pace_fscanf fscanf
+  /* int pace_scanf (const char *format, ... ); */
 
   /**
      PACE's implementation of the POSIX function fseek.
@@ -338,13 +333,8 @@ extern "C" {
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 8.1.
      */
-  #define pace_scanf (X) scanf X
-  /* int pace_scanf (const char *format, ... );
-  *
-  * PLEASE PAY SPECIAL ATTENTION HERE!
-  * This is a macro and requires an additional set of parenthesis
-  * surrounding the arguments.
-  */
+  #define pace_scanf scanf
+  /* int pace_scanf (const char *format, ... ); */
 
   /**
      PACE's implementation of the POSIX function setbuf.
@@ -365,13 +355,8 @@ extern "C" {
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 8.1.
      */
-  #define pace_sscanf (X) sscanf X
-  /* int pace_sscanf (const char *s, const char *format, ... );
-  *
-  * PLEASE PAY SPECIAL ATTENTION HERE!
-  * This is a macro and requires an additional set of parenthesis
-  * surrounding the arguments.
-  */
+  #define pace_sscanf sscanf
+  /* int pace_sscanf (const char *s, const char *format, ... ); */
 
   /**
      PACE's implementation of the POSIX function tmpfile.
diff --git a/PACE/pace/unistd.h b/PACE/pace/unistd.h
index 1f8ef02a4bb..a4502b15344 100644
--- a/PACE/pace/unistd.h
+++ b/PACE/pace/unistd.h
@@ -92,21 +92,24 @@ extern "C" {
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 3.1.2.
      */
-  PACE_INLINE int pace_execl (const char* path, const char* arg, ...);
+# define pace_execl execl
+  /*  PACE_INLINE int pace_execl (const char* path, const char* arg, ...); */
 
   /**
      PACE's implementation of the POSIX function execle.
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 3.1.2.
      */
-  PACE_INLINE int pace_execle (const char* path, const char* arg, ...);
+# define pace_execle execle
+  /*  PACE_INLINE int pace_execle (const char* path, const char* arg, ...);*/
 
   /**
      PACE's implementation of the POSIX function execlp.
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 3.1.2.
      */
-  PACE_INLINE int pace_execlp (const char* file, const char* arg,  ...);
+# define pace_execlp execlp
+  /* PACE_INLINE int pace_execlp (const char* file, const char* arg,  ...);*/
 
   /**
      PACE's implementation of the POSIX function execv.
diff --git a/PACE/tests/mqueue_test.c b/PACE/tests/mqueue_test.c
index 3c949fcdc0d..ee15cd78222 100644
--- a/PACE/tests/mqueue_test.c
+++ b/PACE/tests/mqueue_test.c
@@ -16,7 +16,7 @@ int main (int argc, char** argv)
   attr.mq_flags = O_NONBLOCK;
   attr.mq_msgsize = 51;
   attr.mq_maxmsg = 50;
-  mqd = pace_mq_open (("/hello3", flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH, &attr));
+  mqd = pace_mq_open ("/hello3", flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH, &attr);
   if ((int)mqd == -1)
   {
     perror ("Open");