|
Check-in Number:
|
2235 | |
| Date: |
2002-Jul-05 14:54:56 (local)
2002-Jul-05 12:54:56 (UTC) |
| User: | ms |
| Branch: | |
| Comment: |
Resolve some null pointer and ex_ bugs, and clean up --print output. |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/rc/rc_cliopt.c 1.12 -> 1.13
--- rc_cliopt.c 2002/06/26 14:42:53 1.12
+++ rc_cliopt.c 2002/07/05 12:54:56 1.13
@@ -171,6 +171,7 @@
{
ex_t Except;
+ assert (pkszSecs); /* IF NULL, its broken */
if (m_pszSecs) /* Warn on overwrites */
RC_THROW(RC_WRN_OWR);
|
|
ossp-pkg/rc/rc_proc.c 1.11 -> 1.12
--- rc_proc.c 2002/07/02 18:03:17 1.11
+++ rc_proc.c 2002/07/05 12:54:56 1.12
@@ -181,8 +181,10 @@
fprintf(stderr, "Error: Execute is not implemented yet.\n"); /* FIX */
else if (configGetval(RC_PRN_VAL)) /* Print */
scriptDump(pRc->m_pScript);
- else
- return(RC_THROW(RC_ERR_INT)); /* Not reached */
+ else /* Something is wrong here, there is */
+ fprintf(stderr, "Error: Placeholder, until problem with ex_ is fixed.\n");
+/* FIXME!!: Ralf, following segfaults in ex */
+/* return(RC_THROW(RC_ERR_INT));*/ /* probably no default in the config */
return(RC_THROW(RC_OK));
}
|
|
ossp-pkg/rc/rc_script.c 1.5 -> 1.6
--- rc_script.c 2002/07/04 16:49:58 1.5
+++ rc_script.c 2002/07/05 12:54:56 1.6
@@ -187,10 +187,9 @@
************************************************/
rc_return_t scriptDump(rc_script_t *pScript)
{
- fprintf(stdout, "\n**************** Dumpskripte ****************\n");
- fprintf(stdout, "%s\n", *pScript);
- fprintf(stdout, "**************** Dumpskripte ****************\n\n");
-
+ /* Don't remove this! It encapsulates the script object, */
+ /* which might not be a simple string */
+ fprintf(stdout, "%s", *pScript);
return(RC_THROW(RC_OK));
}
|
|
ossp-pkg/rc/rc_test/rcfuncs 1.1 -> 1.2
--- rcfuncs 2002/07/05 11:16:21 1.1
+++ rcfuncs 2002/07/05 12:54:56 1.2
@@ -11,5 +11,3 @@
echo "Ralf ENGELSCHALL ist aber chef-chef Entwickler!"
echo "**** Funcfile ist fertig, rc gehts weiter ****"
-echo
-
|
|
