|
Check-in Number:
|
2064 | |
| Date: |
2002-Apr-09 19:06:17 (local)
2002-Apr-09 17:06:17 (UTC) |
| User: | ms |
| Branch: | |
| Comment: |
Remove cut and paste crap. |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/rc/Makefile.in 1.19 -> 1.20
--- Makefile.in 2002/04/09 17:01:54 1.19
+++ Makefile.in 2002/04/09 17:06:17 1.20
@@ -60,10 +60,10 @@
TARGET_MANS = rc.1 rc-sample.5
SRCS = rc.c rc_config.c rc_optimpl.c rc_option.c\
- rc_cliopt.c rc_version.c rc_pcre.c rc_util.c
+ rc_cliopt.c rc_opt.c rc_version.c rc_pcre.c rc_util.c
OBJS = rc.o rc_config.o rc_optimpl.o rc_option.o\
- rc_cliopt.o rc_version.o rc_pcre.o rc_util.o
+ rc_cliopt.o rc_opt.o rc_version.o rc_pcre.o rc_util.o
SUBDIRS = @SUBDIR_EX@ @SUBDIR_POPT@
#SUBDIRS = @SUBDIR_EX@ @SUBDIR_VAR@ @SUBDIR_VAL@ @SUBDIR_STR@ @SUBDIR_POPT@
|
|
ossp-pkg/rc/rc.h 1.15 -> 1.16
--- rc.h 2002/04/09 17:01:54 1.15
+++ rc.h 2002/04/09 17:06:17 1.16
@@ -86,6 +86,9 @@
/* Command line accessor prototypes */
short clioptGetvers(void);
+/* Option accessor prototypes */
+short optGetvers(void);
+
/* Utility (nonbounded) function prototypes */
char *strErr(rc_return_t);
|
|
ossp-pkg/rc/rc_opt.c 1.1 -> 1.2
--- rc_opt.c 2002/04/09 17:01:29 1.1
+++ rc_opt.c 2002/04/09 17:06:17 1.2
@@ -35,79 +35,12 @@
/***************************************
-* optConstruct(void) *
-* Construct an option *
+* optGetXXXX(void) *
+* Option accessors *
***************************************/
-rc_return_t clioptConstruct(void)
+short optGetvers(void)
{
- ex_t Except;
-
- if (s_pInst == NULL) { /* If we don't have one */
- s_pInst = malloc(sizeof(s_pInst)); /* yet, then allocate */
- if (!s_pInst) /* a cliopt instance */
- return(RC_THROW(RC_ERR_MEM));
- s_pInst->nLocks = 0;
-
- ex_try {
- /* Make a cliopt instance */
- }
- ex_catch(Except) {
- rethrow;
- }
- }
- s_pInst->nLocks++; /* FIXME not threadsafe */
-
- return(RC_THROW(RC_OK));
-}
-
-/***************************************
-* clioptGetXXXX(void) *
-* Command line option accessors *
-***************************************/
-short clioptGetvers(void)
-{
- ex_t Except;
short nVer = 0;
- if (s_pInst != NULL) {
- ex_try {
-
- }
- ex_catch(Except) {
- rethrow;
- }
- }
- else {
- RC_THROW(RC_ERR_USE);
- return(NULL);
- }
-
return(nVer);
}
-
-/***************************************
-* clioptDestruct(void) *
-* Destruct a command line option *
-***************************************/
-rc_return_t clioptDestruct(void)
-{
- ex_t Except;
-
- if (s_pInst) {
- if (!(--s_pInst->nLocks)) { /* If nLocks is 0, dealloc */
- ex_try { /* FIXME, not thread-safe */
-
- }
- ex_catch(Except) {
- rethrow;
- }
-
- free(s_pInst); /* Deallocate cliopt and */
- s_pInst = NULL; /* clear its reference */
- }
- }
- else
- return(RC_THROW(RC_ERR_USE));
-
- return(RC_THROW(RC_OK));
-}
|
|
