--- rc_cliopt.c 2002/05/23 18:03:20 1.10
+++ rc_cliopt.c 2002/06/26 14:11:16 1.11
@@ -41,7 +41,7 @@
static popt_context m_Optcon; /* Context for parsing options */
static struct popt_option m_pOptable[] = {
- /* Long options with short keys but no arguments */
+ /* Long options are defined as short keys but no arguments */
{RC_USE_NAME, '?', POPT_ARG_NONE, 0, RC_USE_VAL, RC_USE_DESC, NULL},
{RC_DBG_NAME, 'd', POPT_ARG_NONE, 0, RC_DBG_VAL, RC_DBG_DESC, NULL},
{RC_VER_NAME, 'V', POPT_ARG_NONE, 0, RC_VER_VAL, RC_VER_DESC, NULL},
@@ -174,10 +174,10 @@
if (m_pszSecs) /* Warn on overwrites */
RC_THROW(RC_WRN_OWR);
- ex_try {
+ try {
m_pszSecs = vectorCopy(pkszSecs);
}
- ex_catch(Except) {
+ catch(Except) {
rethrow;
}
@@ -282,10 +282,10 @@
/* Now do options processing */
while ((cliOpt = popt_getnextopt(m_Optcon)) >= 0) {/* Loop, each time */
- ex_try { /* eating a new option */
+ try { /* eating a new option */
clioptProcess(cliOpt, popt_getoptarg(m_Optcon));
}
- ex_catch(Except) { /* Error condition probably deserves attention */
+ catch(Except) { /* Error condition probably deserves attention */
rethrow;
}
}
@@ -310,11 +310,11 @@
ex_t Except;
/* Use popt as a transport to read the user specified rcfile and sections */
- ex_try {
+ try {
clioptSetrcfile(popt_getarg(m_Optcon));
clioptSetsecs(popt_getargs(m_Optcon));
}
- ex_catch(Except) {
+ catch(Except) {
rethrow; /* Our generic response */
}
@@ -331,14 +331,14 @@
/* ex_t Except;
assert(s_pBintab);*/ /* Error if not constructed */
-/* ex_try {
+/* try {
clioptRemall();*/ /* Removes ALL list nodes */
/*FIXME optDelete((rc_opt_t **)&s_pBintab->pOptlist->pvData);FIXME*/
/* free(s_pBintab->pOptlist);*/ /* Deallocate option list */
/* free(s_pBintab);*/ /* Deallocate cliopt and */
/* s_pBintab = NULL;*/ /* clear its reference */
/* }
- ex_catch(Except) {
+ catch(Except) {
rethrow;
}*/
|
