|
Check-in Number:
|
3387 | |
| Date: |
2003-May-27 13:53:12 (local)
2003-May-27 11:53:12 (UTC) |
| User: | ms |
| Branch: | |
| Comment: |
Back out volatile identifier additions after better understanding their role. |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/rc/00TODO 1.44 -> 1.45
--- 00TODO 2003/05/23 14:14:34 1.44
+++ 00TODO 2003/05/27 11:53:12 1.45
@@ -35,6 +35,7 @@
Should location regex specify a directory and prefix separately, or files*?
Should we just parse %config of labels which have matching %<...> sections?
Under which user/priority does the %config and %common sections run?
+ Are there bugs due to unused 'volatile' identifiers?
Variation to OpenPKG rc
OpenPKG puts sections with no -p at end, but we give them implicitly -p 200
|
|
ossp-pkg/rc/rc_config.c 1.29 -> 1.30
--- rc_config.c 2003/05/26 16:03:57 1.29
+++ rc_config.c 2003/05/27 11:53:12 1.30
@@ -106,17 +106,17 @@
const char *configGetval(rc_opt_t Optname)
{
ex_t Except;
- volatile char *oszTemp = NULL;
+ char *szTemp = NULL;
if (m_nLocks) { /* Make sure config exists */
try {
- if ((oszTemp = (char *)clioptGetval(Optname)));
-/* else if (oszTemp = envoptGetval(Optname));
- else if (oszTemp = cnfoptGetval(Optname));*/
+ if ((szTemp = (char *)clioptGetval(Optname)));
+/* else if (szTemp = envoptGetval(Optname));
+ else if (szTemp = cnfoptGetval(Optname));*/
}
catch(Except)
rethrow;
- return((const char *)oszTemp);
+ return((const char *)szTemp);
}
else {
RC_THROW(RC_ERR_USE);
@@ -149,7 +149,7 @@
const char *configGetrcfile(void)
{
ex_t Except;
- volatile char *oszRcname = NULL;
+ char *szRcname = NULL;
if (m_nLocks) { /* Make sure config exists */
try {
@@ -157,11 +157,11 @@
/* (2) it must be specified on the command line, */
/* we don't bother checking the environment or conf file */
/* contrary to the behaviour of Getval earlier */
- oszRcname = (char *)clioptGetrcfile();
+ szRcname = (char *)clioptGetrcfile();
}
catch(Except)
rethrow;
- return((const char *)oszRcname);
+ return((const char *)szRcname);
}
else
RC_THROW(RC_ERR_USE);
@@ -171,15 +171,15 @@
const char **configGetsecs(void)
{
ex_t Except;
- volatile char **opszSecname = NULL;
+ char **pszSecname = NULL;
if (m_nLocks) { /* Make sure config exists */
try { /* FIXME Might need to check */
- opszSecname = (char **)clioptGetsecs(); /* FIXME env, conf, configs */
+ pszSecname = (char **)clioptGetsecs(); /* FIXME env, conf, configs */
}
catch(Except)
rethrow;
- return((const char **)opszSecname);
+ return((const char **)pszSecname);
}
else
RC_THROW(RC_ERR_USE);
|
|
