ossp-pkg/rc/rc_proc.c 1.39 -> 1.40
--- rc_proc.c 2003/05/28 14:40:25 1.39
+++ rc_proc.c 2003/05/28 15:09:29 1.40
@@ -85,7 +85,7 @@
char *szLocex = NULL;
rc_script_t *pTempscript = NULL;
- assert(*pRc->m_pAnal->m_szRcs);
+ assert(*pRc->m_pAnal->m_pszRcs);
sBuf = (char *)calloc(1, RC_READ_BUFSIZE);
/* Stick on the starting shell id line */
@@ -109,19 +109,19 @@
/* Iteratively read possibly globbed rc files */
for (nRc = 0; nRc < pRc->m_pAnal->m_nRcs; nRc++)
{
- assert(*pRc->m_pAnal->m_szRcs); /* If one of these assertions fail, */
- assert(pRc->m_pAnal->m_szLocs); /* you've probably seen the ex_ bug */
+ assert(*pRc->m_pAnal->m_pszRcs);
+ assert(pRc->m_pAnal->m_szLocs);
/* Construct a new label */
- pRc->m_ppLabvec[nRc] = labelNew(pRc->m_pAnal->m_szRcs[nRc]);
+ pRc->m_ppLabvec[nRc] = labelNew(pRc->m_pAnal->m_pszRcs[nRc]);
/* Build the path name */
szLocex = (char *)malloc(strlen(pRc->m_pAnal->m_szLocs) + \
- strlen(pRc->m_pAnal->m_szRcs[nRc]) + \
+ strlen(pRc->m_pAnal->m_pszRcs[nRc]) + \
strlen("rc.") + 1);
strcpy(szLocex, pRc->m_pAnal->m_szLocs);
strcat(szLocex, "rc."); /* FIXME: Make the prefix configurable */
- strcat(szLocex, pRc->m_pAnal->m_szRcs[nRc]);
+ strcat(szLocex, pRc->m_pAnal->m_pszRcs[nRc]);
/* Open the rc file unconditionally */
if ((nFdrc = open(szLocex, O_RDONLY)) == -1)
@@ -154,7 +154,7 @@
else if (configGetval(RC_DBG_VAL)) /* Only show if debug set */
fprintf(stderr, "#Warning: Missing section '%s' in %s!\n",\
pRc->m_pAnal->m_pszSecs[nSect],\
- pRc->m_pAnal->m_szRcs[nRc]);
+ pRc->m_pAnal->m_pszRcs[nRc]);
if (pSec) { /* Cleanup iterative section string */
sectionDelete(pSec);
|
|
