OSSP CVS Repository

ossp - Check-in [1849]
Not logged in 		[Honeypot]  [Browse]  [Home]  [Login]  [Reports] 
[Search]  [Ticket]  [Timeline] 
  [Patchset]  [Tagging/Branching] 

Check-in Number: 1849
Date: 2002-Feb-13 20:19:28 (local)
2002-Feb-13 19:19:28 (UTC)
User:ms
Branch:
Comment: Small corrections in both logic and build configuration.

PR: Submitted by: Reviewed by: Approved by: Obtained from:

Tickets:
Inspections:
Files:
ossp-pkg/rc/Makefile.in      1.14 -> 1.15     2 inserted, 2 deleted
ossp-pkg/rc/aclocal.m4      1.6 -> 1.7     2 inserted, 1 deleted
ossp-pkg/rc/rc.c      1.12 -> 1.13     2 inserted, 2 deleted
ossp-pkg/rc/rc_config.c      1.1 -> 1.2     0 inserted, 1 deleted
ossp-pkg/rc/rc_option.c      1.2 -> 1.3     1 inserted, 7 deleted
ossp-pkg/rc/rc_private.h      1.2 -> 1.3     1 inserted, 1 deleted
ossp-pkg/rc/rc_util.c      1.1 -> 1.2     1 inserted, 0 deleted
ossp-pkg/rc/Makefile.in 1.14 -> 1.15 

--- Makefile.in  2002/02/12 17:59:50     1.14
+++ Makefile.in  2002/02/13 19:19:28     1.15
@@ -102,8 +102,8 @@
         $(RM) rc_pcre.gen
 
 $(PROG_NAME): $(OBJS)
-#       $(LIBTOOL) --mode=link --quiet $(CC) $(LDFLAGS) -o $@ $+ $(LIBS)
-        $(CC) $(LDFLAGS) -o $@ $+ $(LIBS)
+#       $(LIBTOOL) --mode=link --quiet $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+        $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
 rc.1: rc.pod
         VS=`$(SHTOOL) version -lc -dshort rc_version.c`; \

ossp-pkg/rc/aclocal.m4 1.6 -> 1.7 

--- aclocal.m4   2002/02/06 16:56:33     1.6
+++ aclocal.m4   2002/02/13 19:19:28     1.7
@@ -136,7 +136,8 @@
         *-pipe* ) ;;
               * ) AC_COMPILER_OPTION(pipe, -pipe, -pipe, CFLAGS="$CFLAGS -pipe") ;;
     esac
-    AC_COMPILER_OPTION(ggdb3, -ggdb3, -ggdb3, CFLAGS="$CFLAGS -ggdb3")
+    AC_COMPILER_OPTION(defdbg, -DDEBUG, -DDEBUG, CFLAGS="$CFLAGS -DDEBUG")
+dnl    AC_COMPILER_OPTION(ggdb3, -ggdb3, -ggdb3, CFLAGS="$CFLAGS -ggdb3")
     CFLAGS="$CFLAGS -pedantic"
     CFLAGS="$CFLAGS -Wall"
     WMORE="-Wshadow -Wpointer-arith -Wcast-align -Winline"

ossp-pkg/rc/rc.c 1.12 -> 1.13 

--- rc.c 2002/02/08 18:36:40     1.12
+++ rc.c 2002/02/13 19:19:28     1.13
@@ -46,8 +46,8 @@
     }
     ex_catch(Except) {
         bCaught = 1;
-        fprintf(stderr, "Class '%s' threw exception %s in %s:%s():%d.\n",\
-               (char *)Except.ex_class, *(int *)Except.ex_value,\
+        fprintf(stderr, "Class '%s' threw exception %d in %s:%s():%d.\n",\
+               (char *)Except.ex_class, (int)Except.ex_value,\
                Except.ex_file, Except.ex_func, Except.ex_line);
         exit(1);    /* Failure */
     }

ossp-pkg/rc/rc_config.c 1.1 -> 1.2 

--- rc_config.c  2002/02/08 18:36:40     1.1
+++ rc_config.c  2002/02/13 19:19:28     1.2
@@ -29,7 +29,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
 
 #include "rc.h"
 #include "rc_private.h"

ossp-pkg/rc/rc_option.c 1.2 -> 1.3 

--- rc_option.c  2002/02/08 18:36:40     1.2
+++ rc_option.c  2002/02/13 19:19:28     1.3
@@ -72,7 +72,6 @@
     int  nBufpos = 0;           /* For tracking options           */
     char cOpt = 0;              /* For argument parsing           */
     char *szCLIBuf = NULL;
-    char *szFuncfile = NULL;    /* Rc.func file name and location */
     int  nIter = 0;
     popt_context optCon;        /* Context for parsing options    */
 
@@ -94,10 +93,7 @@
         /* Single argument long options with short keys */
         {RC_LOC_NAME, 'L', POPT_ARG_STRING, 0, RC_LOC_VAL, RC_LOC_DESC, "regx"},
         {RC_CNF_NAME, 'c', POPT_ARG_STRING, 0, RC_CNF_VAL, RC_CNF_DESC, "path"},
-
-        {RC_FNC_NAME, 'f', POPT_ARG_STRING, &szFuncfile,\
-           RC_FNC_VAL, RC_FNC_DESC, "path"},
-
+        {RC_FNC_NAME, 'f', POPT_ARG_STRING, 0, RC_FNC_VAL, RC_FNC_DESC, "path"},
         {RC_QRY_NAME, 'q', POPT_ARG_STRING, 0, RC_QRY_VAL, RC_QRY_DESC, "varx"},
         {RC_TMP_NAME, 't', POPT_ARG_STRING, 0, RC_TMP_VAL, RC_TMP_DESC, "path"},
 
@@ -163,8 +159,6 @@
     fprintf(stderr, "Options chosen: ");
     for (nIter = 0; nIter < nBufpos ; nIter++)
         fprintf(stderr, "-%c ", pcBuf[nIter]);
-    if (szFuncfile)
-        fprintf(stderr, "-f %s ", szFuncfile);
     fprintf(stderr, "\nRun these commands: %s\n", szCLIBuf);
 
     popt_freecontext(optCon);

ossp-pkg/rc/rc_private.h 1.2 -> 1.3 

--- rc_private.h 2002/02/11 12:34:29     1.2
+++ rc_private.h 2002/02/13 19:19:28     1.3
@@ -51,7 +51,7 @@
 /* Define the ability to throw OSSP ex exceptions       */
 #include "ex.h" /* OSSP ex exception handling library   */
 #define RC_THROW(rv) \
-    (  (rv) != RC_OK && (ex_catching && !ex_shielding) \
+    ((rv) != RC_OK && (ex_catching && !ex_shielding) \
      ? (ex_throw(ossprc_id, NULL, (rv)), (rv)) : (rv))
 
 #include "val.h"

ossp-pkg/rc/rc_util.c 1.1 -> 1.2 

--- rc_util.c    2002/02/08 18:36:40     1.1
+++ rc_util.c    2002/02/13 19:19:28     1.2
@@ -30,6 +30,7 @@
 #include "rc.h"         /* Error definitions  */
 #include "rc_const.h"   /* String definitions */
 
+
 /* Translate an error code to a string */
 char *strErr(rc_return_t rv)
 {

CVSTrac 2.0.1