You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2003/03/30 20:57:04 UTC
cvs commit: embperl Changes.pod DOM.xs Makefile.PL Old.xs epcache.c epcgiinit.c epcmd2.c epcomp.c epdefault.c epdom.c epeval.c epinit.c epmain.c epparse.c epprovider.c eputil.c mod_embperl.c typemap
richter 2003/03/30 10:57:04
Modified: . Changes.pod DOM.xs Makefile.PL Old.xs epcache.c
epcgiinit.c epcmd2.c epcomp.c epdefault.c epdom.c
epeval.c epinit.c epmain.c epparse.c epprovider.c
eputil.c mod_embperl.c typemap
Log:
fix compiler warnings
Revision Changes Path
1.206 +2 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- Changes.pod 30 Mar 2003 14:12:14 -0000 1.205
+++ Changes.pod 30 Mar 2003 18:57:01 -0000 1.206
@@ -72,6 +72,8 @@
- Added patch from David Hull, which let you specify the status-code
when doing a redirect via %http_headers_out.
- Fix SIGSEGV on sparc in cleanup. Patch from Angus Lees.
+ - Apply patch from Angus Lees which avoids a lot of (harmless) compiler
+ warnings.
=head1 2.0b8 (BETA) 25. Juni 2002
1.7 +2 -2 embperl/DOM.xs
Index: DOM.xs
===================================================================
RCS file: /home/cvs/embperl/DOM.xs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DOM.xs 14 Feb 2003 22:02:57 -0000 1.6
+++ DOM.xs 30 Mar 2003 18:57:01 -0000 1.7
@@ -32,7 +32,7 @@
tDomNode * pDomNode ;
MAGIC * mg ;
SV * pSV = SvRV(pRV) ;
- if (mg = mg_find (pSV, '~'))
+ if ((mg = mg_find (pSV, '~')))
{
pDomNode = (tDomNode *)(mg -> mg_len) ;
if (xDomTree)
1.63 +19 -9 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Makefile.PL 30 Mar 2003 14:12:14 -0000 1.62
+++ Makefile.PL 30 Mar 2003 18:57:01 -0000 1.63
@@ -276,12 +276,22 @@
my $man = $self -> {MAN3PODS} ;
while (($k, $v) = each (%$man))
{
- if (!($v =~ /::Embperl/))
- {
- $v =~ s#HTML::#HTML::Embperl::# ;
- $man -> {$k} = $v ;
- }
- }
+ if ($v !~ /Embperl/)
+ {
+ $v =~ s,/([^/]+)$,/Embperl::$1, ;
+ $man -> {$k} = $v ;
+ }
+ }
+
+ foreach my $hash (qw(MAN3PODS PM))
+ {
+ foreach (keys %{$self->{$hash}})
+ {
+ delete $self->{$hash}{$_}
+ if /^(INSTALL|NEWS|Changes)|\.pl$/ ;
+ }
+ }
+
$self -> MM::post_initialize (@_) ;
}
@@ -624,7 +634,7 @@
if (!$b)
{
- $base = GetString ("Apache source not found, enter path name or q to quit", '') ;
+ $base = GetString ("Apache source not found, enter path name or q to quit", 'q') ;
if ($base eq 'q')
{
$apache = 0 ;
@@ -1260,7 +1270,7 @@
'INC' => $i,
'EXE_FILES' => [ 'embpexec.pl' ],
'clean' => { FILES => 'dirent.h test/conf/httpd.conf test/tmp/* Embperl.c' },
- 'realclean' => { FILES => 'embpexec.pl embpexec.bat embpcgi.pl embpcgi.test.pl embpcgi.bat test/conf/config.pl' },
+ 'realclean' => { FILES => 'embpexec.pl embpexec.bat embpcgi.pl embpcgi.test.pl embpcgi.bat epocgi.pl epocgi.bat epocgi.test.pl embpfastcgi.pl test/conf/config.pl' },
'dist' => { COMPRESS => 'gzip', SUFFIX => 'gz'},
'dynamic_lib' => $dynlib,
'PREREQ_PM' => { 'File::Spec' => 0.8 },
1.4 +4 -4 embperl/Old.xs
Index: Old.xs
===================================================================
RCS file: /home/cvs/embperl/Old.xs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Old.xs 31 Jan 2003 05:15:59 -0000 1.3
+++ Old.xs 30 Mar 2003 18:57:01 -0000 1.4
@@ -43,8 +43,8 @@
tReq * r = CurrReq ;
int bRestore = 0 ;
#ifdef APACHE
- SV * pSaveApacheReqSV ;
- request_rec * pSaveApacheReq ;
+ SV * pSaveApacheReqSV = NULL ;
+ request_rec * pSaveApacheReq = NULL ;
#endif
CODE:
#ifdef APACHE
@@ -177,8 +177,8 @@
PREINIT:
int bRestore = 0 ;
#ifdef APACHE
- SV * pSaveApacheReqSV ;
- request_rec * pSaveApacheReq ;
+ SV * pSaveApacheReqSV = NULL ;
+ request_rec * pSaveApacheReq = NULL ;
#endif
CODE:
#ifdef APACHE
1.4 +3 -3 embperl/epcache.c
Index: epcache.c
===================================================================
RCS file: /home/cvs/embperl/epcache.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- epcache.c 20 Nov 2002 06:56:26 -0000 1.3
+++ epcache.c 30 Mar 2003 18:57:01 -0000 1.4
@@ -318,7 +318,7 @@
return rc ;
sKey = SvPV(pKey, len) ;
- if (pNew = Cache_GetByKey (r, sKey))
+ if ((pNew = Cache_GetByKey (r, sKey)))
{
Cache_ParamUpdate (r, pProviderParam, bTopLevel, "Update", pNew) ;
@@ -492,7 +492,7 @@
r -> pThread -> nPid, sProvider) ;
return rc ;
}
- if (pItem = Cache_GetByKey (r, SvPV(pKey, len)))
+ if ((pItem = Cache_GetByKey (r, SvPV(pKey, len))))
{
int bCache = pItem -> bCache ;
1.7 +5 -3 embperl/epcgiinit.c
Index: epcgiinit.c
===================================================================
RCS file: /home/cvs/embperl/epcgiinit.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- epcgiinit.c 15 Feb 2003 20:46:31 -0000 1.6
+++ epcgiinit.c 30 Mar 2003 18:57:01 -0000 1.7
@@ -36,16 +36,18 @@
tainted = 0 ; \
p = GetHashValueStr (aTHX_ pThread -> pEnvHash, REDIR"EMBPERL_"#CFGNAME, NULL) ; \
if (p) \
+ { \
if (isdigit(*p)) \
pConfig -> NAME = (TYPE)strtol (p, NULL, 0) ; \
else \
{ \
int val ; \
int rc ; \
- if (rc = embperl_OptionListSearch(Options##CFGNAME,1,#CFGNAME,p,&val)) \
+ if ((rc = embperl_OptionListSearch(Options##CFGNAME,1,#CFGNAME,p,&val))) \
return rc ; \
pConfig -> NAME = (TYPE)val ; \
} \
+ } \
tainted = 0 ; \
}
@@ -294,7 +296,7 @@
pParam -> sUri = GetHashValueStrDup (aTHX_ pPool, pThread -> pEnvHash, "PATH_INFO", "") ;
pParam -> sPathInfo = GetHashValueStrDup (aTHX_ pPool, pThread -> pEnvHash, "PATH_INFO", "") ;
pParam -> sQueryInfo = GetHashValueStrDup (aTHX_ pPool, pThread -> pEnvHash, "QUERY_STRING", "") ;
- if (p = GetHashValueStrDup (aTHX_ pPool, pThread -> pEnvHash, "HTTP_ACCEPT_LANGUAGE", NULL))
+ if ((p = GetHashValueStrDup (aTHX_ pPool, pThread -> pEnvHash, "HTTP_ACCEPT_LANGUAGE", NULL)))
{
while (isspace(*p))
p++ ;
1.9 +3 -3 embperl/epcmd2.c
Index: epcmd2.c
===================================================================
RCS file: /home/cvs/embperl/epcmd2.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- epcmd2.c 20 Nov 2002 06:56:26 -0000 1.8
+++ epcmd2.c 30 Mar 2003 18:57:01 -0000 1.9
@@ -83,7 +83,7 @@
-static embperlCmd_SetRemove (/*i/o*/ register req * r,
+static void embperlCmd_SetRemove (/*i/o*/ register req * r,
/*in*/ tDomTree * pDomTree,
/*in*/ tNode xNode,
/*in*/ tRepeatLevel nRepeatLevel,
@@ -445,7 +445,7 @@
lprintf (r -> pApp, "a xOldChild=%d, rl=%d\n", xOldChild, nRepeatLevel) ;
hv_iterinit (pHV) ;
- while (pEntry = hv_iternext (pHV))
+ while ((pEntry = hv_iternext (pHV)))
{
if (i++ > 0)
Node_appendChild (r -> pApp, pDomTree, xOldChild, nRepeatLevel, ntypCDATA, 0, "&", 5, 0, 0, NULL) ;
1.8 +13 -12 embperl/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/epcomp.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- epcomp.c 15 Nov 2002 06:17:36 -0000 1.7
+++ epcomp.c 30 Mar 2003 18:57:01 -0000 1.8
@@ -333,7 +333,7 @@
or = strchr (eq + 1, '|') ;
e = or?or:q ;
- if (f = (char *)strstrn (sText, eq, e - eq))
+ if ((f = (char *)strstrn (sText, eq, e - eq)))
if (!isalnum (f[e - eq]) && f[e - eq] != '_')
break ;
if (or == NULL)
@@ -676,7 +676,7 @@
{
if (pChildNode -> bFlags & aflgAttrChilds)
{
- int l = sprintf (buf, "XML::Embperl::DOM::Attr::iValue ($_ep_DomTree,%d)", pChildNode -> xNdx) ;
+ int l = sprintf (buf, "XML::Embperl::DOM::Attr::iValue ($_ep_DomTree,%ld)", pChildNode -> xNdx) ;
sText = buf ;
if (out == 2)
out = 1 ;
@@ -795,7 +795,7 @@
if (*p == 'n')
{
char s [20] ;
- int l = sprintf (s, "$_ep_DomTree,%u", pNode -> xNdx) ;
+ int l = sprintf (s, "$_ep_DomTree,%ld", pNode -> xNdx) ;
StringAdd (r -> pApp, ppCode, s, l) ;
}
else if (*p == 't')
@@ -805,13 +805,13 @@
else if (*p == 'x')
{
char s [20] ;
- int l = sprintf (s, "%u", pNode -> xNdx) ;
+ int l = sprintf (s, "%ld", pNode -> xNdx) ;
StringAdd (r -> pApp, ppCode, s, l) ;
}
else if (*p == 'l')
{
char s [20] ;
- int l = sprintf (s, "%u", pDomTree -> xLastNode) ;
+ int l = sprintf (s, "%ld", pDomTree -> xLastNode) ;
StringAdd (r -> pApp, ppCode, s, l) ;
}
else if (*p == 'c')
@@ -819,7 +819,7 @@
char s [20] ;
if (pDomTree -> xLastNode != pDomTree -> xCurrNode)
{
- int l = sprintf (s, "$_ep_node=%u;", pDomTree -> xLastNode) ;
+ int l = sprintf (s, "$_ep_node=%ld;", pDomTree -> xLastNode) ;
StringAdd (r -> pApp, ppCode, s, l) ;
xCurrNode = pDomTree -> xLastNode ;
}
@@ -827,7 +827,7 @@
else if (*p == 'q')
{
char s [20] ;
- int l = sprintf (s, "%u", pDomTree -> xNdx) ;
+ int l = sprintf (s, "%ld", pDomTree -> xNdx) ;
StringAdd (r -> pApp, ppCode, s, l) ;
}
else if (*p == 'p')
@@ -842,7 +842,7 @@
int l ;
tIndex nCheckpointArrayOffset = ArrayAdd (r -> pApp, &pDomTree -> pCheckpoints, 1) ;
pDomTree -> pCheckpoints[nCheckpointArrayOffset].xNode = pNode -> xNdx ;
- l = sprintf (s, " _ep_cp(%d) ;\n", nCheckpointArrayOffset) ;
+ l = sprintf (s, " _ep_cp(%ld) ;\n", nCheckpointArrayOffset) ;
StringAdd (r -> pApp, ppCode, s, l) ;
if (r -> Component.Config.bDebug & dbgCompile)
@@ -1110,7 +1110,7 @@
if (pCmd -> bRemoveNode & 16)
{
tNodeData * pChild ;
- while (pChild = Node_selfFirstChild (r -> pApp, pDomTree, pNode, 0))
+ while ((pChild = Node_selfFirstChild (r -> pApp, pDomTree, pNode, 0)))
{
Node_selfRemoveChild (r -> pApp, pDomTree, pNode -> xNdx, pChild) ;
}
@@ -1400,7 +1400,8 @@
if (nNdx <= pInfo -> nMaxEmbperlCmd)
{
pCmd = pCmdHead = &(pInfo -> pEmbperlCmds[nNdx]) ;
- /* ??if (pCmd -> nNodeType != pNode -> nType) */
+ pCmdLast = NULL ;
+ /* ??if (pCmd -> nNodeType != pNode -> nType) */
/* pCmd = NULL ; */
}
else
@@ -1447,7 +1448,7 @@
if (pCmd == NULL || (pCmd -> bRemoveNode & 8) == 0)
{ /* calculate attributes before tag, but not when tag should be ignored in output stream */
- while (pAttr = Element_selfGetNthAttribut (r -> pApp, pDomTree, pNode, nAttr++))
+ while ((pAttr = Element_selfGetNthAttribut (r -> pApp, pDomTree, pNode, nAttr++)))
{
if (pAttr -> bFlags & aflgAttrChilds)
{
1.3 +1 -2 embperl/epdefault.c
Index: epdefault.c
===================================================================
RCS file: /home/cvs/embperl/epdefault.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- epdefault.c 22 Oct 2002 05:29:05 -0000 1.2
+++ epdefault.c 30 Mar 2003 18:57:02 -0000 1.3
@@ -95,7 +95,6 @@
static void embperl_DefaultComponentConfig (/*in*/ tComponentConfig *pCfg)
{
- pCfg -> sPackage ;
pCfg -> bDebug = dbgStd ;
/* pCfg -> bOptions = optRawInput | optAllFormData ; */
pCfg -> nEscMode = escStd ;
1.10 +17 -9 embperl/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/epdom.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- epdom.c 26 Nov 2002 10:03:40 -0000 1.9
+++ epdom.c 30 Mar 2003 18:57:02 -0000 1.10
@@ -96,7 +96,7 @@
if (nFree > sizeof (MemFree) / sizeof (void *))
mydie (a, "Node to huge for dom_malloc") ;
- if (pNew = MemFree[nFree])
+ if ((pNew = MemFree[nFree]))
{ /* --- take one entry off the free list --- */
MemFree[nFree] = *((tUInt8 * *)pNew) ;
(*pCounter)++ ;
@@ -254,7 +254,7 @@
void * m = ((size_t *)s) - 1 ;
size_t * m_size;
nMemUsage -= *((size_t *)m) ;
- if (m = realloc (m, n + sizeof (size_t)))
+ if ((m = realloc (m, n + sizeof (size_t))))
{
nMemUsage += n ;
/* make the following in multiple step, so sun-cc is happy... */
@@ -1166,7 +1166,10 @@
dom_free (a, pNode, &numNodes) ;
}
else
- pNode = NULL ;
+ {
+ xNode = -1 ;
+ pNode = NULL ;
+ }
if ((pLookupLevelNode = pLookup -> pLookupLevel) && (pLookupLevelNode -> xNullNode == xNode || pNode == NULL))
{
@@ -1896,7 +1899,7 @@
}
if (pLnNode -> nRepeatLevel == nLevel)
return pLnNode ;
- while (pLookupLevelNodeLevel = pLookupLevelNodeLevel -> pNext)
+ while ((pLookupLevelNodeLevel = pLookupLevelNodeLevel -> pNext))
{
pLnNode = pLookupLevelNodeLevel -> pNode ;
if (pLnNode -> nRepeatLevel == nLevel)
@@ -2352,7 +2355,7 @@
pLookupLevelNodeLevel -> pNode = pNewChild ;
else
{
- while (pLookupLevelNodeLevel = pLookupLevelNodeLevel -> pNext)
+ while ((pLookupLevelNodeLevel = pLookupLevelNodeLevel -> pNext))
{
pLnNode = pLookupLevelNodeLevel -> pNode ;
if (pLnNode -> nRepeatLevel == nLevel)
@@ -3335,6 +3338,8 @@
pNodeName++ ;
}
}
+ else
+ pNodeEnd = "" ;
if (*pNodeName == ':')
pNodeName++ ;
@@ -3391,11 +3396,12 @@
if (pAttr -> xValue)
{
if (pAttr -> xName != xNoName)
- if (pAttr -> bFlags & aflgSingleQuote)
+ {
+ if (pAttr -> bFlags & aflgSingleQuote)
oputs (r, "='") ;
else
oputs (r, "=\"") ;
-
+ }
if (pAttr -> bFlags & aflgAttrChilds)
{
tAttrData * pAttrNode = (tAttrData * )Node_toString2 (r, pDomTree, pAttr -> xNdx, &nRepeatLevel) ;
@@ -3419,10 +3425,12 @@
nLastLen += l ;
}
if (pAttr -> xName != xNoName)
- if (pAttr -> bFlags & aflgSingleQuote)
+ {
+ if (pAttr -> bFlags & aflgSingleQuote)
oputc (r, '\'') ;
else
oputc (r, '"') ;
+ }
}
}
pAttr++ ;
1.32 +5 -4 embperl/epeval.c
Index: epeval.c
===================================================================
RCS file: /home/cvs/embperl/epeval.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- epeval.c 22 Oct 2002 05:29:05 -0000 1.31
+++ epeval.c 30 Mar 2003 18:57:02 -0000 1.32
@@ -145,7 +145,7 @@
if (strncmp (s, "sub ", 4) == 0)
{
SV * pSVErr ;
- SV * pRV ;
+ SV * pRV = NULL ;
int n ;
n = perl_eval_sv (pSV, G_EVAL | G_SCALAR) ;
@@ -233,7 +233,7 @@
SV * pSV ;
char * p ;
STRLEN l ;
- SV * pRV ;
+ SV * pRV = NULL ;
SV * pSVErr ;
char c ;
int n ;
@@ -1392,4 +1392,5 @@
return rc ;
return ok ; /* SvIV (pRet) ;*/
}
-#endif
\ No newline at end of file
+#endif
+
1.8 +21 -21 embperl/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/epinit.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- epinit.c 15 Feb 2003 20:46:31 -0000 1.7
+++ epinit.c 30 Mar 2003 18:57:02 -0000 1.8
@@ -337,7 +337,7 @@
tAppConfig * pCfg = &a -> Config ;
char * sPackage = pCfg -> sSessionHandlerClass ;
HV * pHash = newHV () ;
- SV * pTie ;
+ SV * pTie = NULL ;
int n ;
SV * pSVCode ;
@@ -1507,7 +1507,7 @@
if (SvREFCNT(SvRV(pOutput -> _perlsv)) != 1)
{
char buf[20] ;
- sprintf (buf, "%d", SvREFCNT(SvRV(pOutput -> _perlsv)) - 1) ;
+ sprintf (buf, "%d", (int)SvREFCNT(SvRV(pOutput -> _perlsv)) - 1) ;
LogErrorParam (r -> pApp, rcRefcntNotOne, buf, "request.component.output") ;
}
sv_unmagic(SvRV(pOutput -> _perlsv), '~') ;
@@ -1571,19 +1571,19 @@
if (SvREFCNT(SvRV(c -> Config._perlsv)) != 1)
{
char buf[20] ;
- sprintf (buf, "%d", SvREFCNT(SvRV(c -> Config._perlsv)) - 1) ;
+ sprintf (buf, "%d", (int)SvREFCNT(SvRV(c -> Config._perlsv)) - 1) ;
LogErrorParam (r -> pApp, rcRefcntNotOne, buf, "request.component.config") ;
}
if (SvREFCNT(SvRV(c -> Param._perlsv)) != 1)
{
char buf[20] ;
- sprintf (buf, "%d", SvREFCNT(SvRV(c -> Param._perlsv)) - 1) ;
+ sprintf (buf, "%d", (int)SvREFCNT(SvRV(c -> Param._perlsv)) - 1) ;
LogErrorParam (r -> pApp, rcRefcntNotOne, buf, "request.component.param") ;
}
if (SvREFCNT(c -> _perlsv) != 1)
{
char buf[20] ;
- sprintf (buf, "%d", SvREFCNT(SvRV(c -> _perlsv)) - 1) ;
+ sprintf (buf, "%d", (int)SvREFCNT(SvRV(c -> _perlsv)) - 1) ;
LogErrorParam (r -> pApp, rcRefcntNotOne, buf, "request.component") ;
}
@@ -1593,13 +1593,13 @@
Embperl__Component_destroy(aTHX_ c) ;
pHV = SvRV (c -> _perlsv) ;
- if (mg = mg_find (pHV, '~'))
+ if ((mg = mg_find (pHV, '~')))
*((tComponent **)(mg -> mg_ptr)) = &NullRequest.Component ;
pHV = SvRV (c -> Config._perlsv) ;
- if (mg = mg_find (pHV, '~'))
+ if ((mg = mg_find (pHV, '~')))
*((tComponentConfig **)(mg -> mg_ptr)) = &NullRequest.Component.Config ;
pHV = SvRV (c -> Param._perlsv) ;
- if (mg = mg_find (pHV, '~'))
+ if ((mg = mg_find (pHV, '~')))
*((tComponentParam **)(mg -> mg_ptr)) = &NullRequest.Component.Param ;
SvREFCNT_dec (c -> Config._perlsv) ;
@@ -1615,13 +1615,13 @@
/* adjust pointer in perl magic */
pHV = SvRV (c -> _perlsv) ;
- if (mg = mg_find (pHV, '~'))
+ if ((mg = mg_find (pHV, '~')))
*((tComponent **)(mg -> mg_ptr)) = c ;
pHV = SvRV (c -> Config._perlsv) ;
- if (mg = mg_find (pHV, '~'))
+ if ((mg = mg_find (pHV, '~')))
*((tComponentConfig **)(mg -> mg_ptr)) = &c -> Config ;
pHV = SvRV (c -> Param._perlsv) ;
- if (mg = mg_find (pHV, '~'))
+ if ((mg = mg_find (pHV, '~')))
*((tComponentParam **)(mg -> mg_ptr)) = &c -> Param ;
}
else
@@ -1710,13 +1710,13 @@
if (SvREFCNT(SvRV(r -> Config._perlsv)) != 1)
{
char buf[20] ;
- sprintf (buf, "%d", SvREFCNT(SvRV(r -> Config._perlsv)) - 1) ;
+ sprintf (buf, "%d", (int)SvREFCNT(SvRV(r -> Config._perlsv)) - 1) ;
LogErrorParam (r -> pApp, rcRefcntNotOne, buf, "request.config") ;
}
if (SvREFCNT(SvRV(r -> Param._perlsv)) != 1)
{
char buf[20] ;
- sprintf (buf, "%d", SvREFCNT(SvRV(r -> Param._perlsv)) - 1) ;
+ sprintf (buf, "%d", (int)SvREFCNT(SvRV(r -> Param._perlsv)) - 1) ;
LogErrorParam (r -> pApp, rcRefcntNotOne, buf, "request.param") ;
}
/*
@@ -1738,13 +1738,13 @@
Embperl__Req_destroy(aTHX_ r) ;
pHV = SvRV (r -> _perlsv) ;
- if (mg = mg_find (pHV, '~'))
+ if ((mg = mg_find (pHV, '~')))
*((tReq **)(mg -> mg_ptr)) = &NullRequest ;
pHV = SvRV (r -> Config._perlsv) ;
- if (mg = mg_find (pHV, '~'))
+ if ((mg = mg_find (pHV, '~')))
*((tReqConfig **)(mg -> mg_ptr)) = &NullRequest.Config ;
pHV = SvRV (r -> Param._perlsv) ;
- if (mg = mg_find (pHV, '~'))
+ if ((mg = mg_find (pHV, '~')))
*((tReqParam **)(mg -> mg_ptr)) = &NullRequest.Param ;
@@ -1881,13 +1881,13 @@
/* adjust pointer in perl magic */
pHV = SvRV (pPrev -> _perlsv) ;
- if (mg = mg_find (pHV, '~'))
+ if ((mg = mg_find (pHV, '~')))
*((tComponent **)(mg -> mg_ptr)) = pPrev ;
pHV = SvRV (pPrev -> Config._perlsv) ;
- if (mg = mg_find (pHV, '~'))
+ if ((mg = mg_find (pHV, '~')))
*((tComponentConfig **)(mg -> mg_ptr)) = &pPrev -> Config ;
pHV = SvRV (pPrev -> Param._perlsv) ;
- if (mg = mg_find (pHV, '~'))
+ if ((mg = mg_find (pHV, '~')))
*((tComponentParam **)(mg -> mg_ptr)) = &pPrev -> Param ;
}
@@ -1983,7 +1983,7 @@
else
pParam -> sInputfile = r -> Param.sFilename ;
}
- else if (p = strchr(pParam -> sInputfile, '#'))
+ else if ((p = strchr(pParam -> sInputfile, '#')))
{
pParam -> sSub = p + 1 ;
if (p == pParam -> sInputfile && c -> pPrev)
1.123 +3 -3 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- epmain.c 3 Mar 2003 18:38:46 -0000 1.122
+++ epmain.c 30 Mar 2003 18:57:02 -0000 1.123
@@ -457,7 +457,7 @@
char * pInitialUID = NULL ;
STRLEN ulen = 0 ;
STRLEN ilen = 0 ;
- IV bModified ;
+ IV bModified = 0 ;
char * pCookie = NULL ;
STRLEN ldummy ;
tAppConfig * pCfg = &r -> pApp -> Config ;
@@ -1202,7 +1202,7 @@
epTHX_
int rc ;
SV * pParam ;
- SV * pParamRV ;
+ SV * pParamRV = NULL ;
SV * pRecipe = r -> Component.Config.pRecipe ;
STRLEN l ;
int num ;
1.8 +10 -10 embperl/epparse.c
Index: epparse.c
===================================================================
RCS file: /home/cvs/embperl/epparse.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- epparse.c 26 Nov 2002 10:03:42 -0000 1.7
+++ epparse.c 30 Mar 2003 18:57:02 -0000 1.8
@@ -95,7 +95,7 @@
pHVProcInfo = (HV *)SvRV (*ppSV) ;
hv_iterinit (pHVProcInfo ) ;
- while (pEntry = hv_iternext (pHVProcInfo))
+ while ((pEntry = hv_iternext (pHVProcInfo)))
{
pKey = hv_iterkey (pEntry, &l) ;
pSVValue = hv_iterval (pHVProcInfo , pEntry) ;
@@ -336,7 +336,7 @@
p -> pStartTag = (struct tToken *)GetHashValueStrDup (aTHX_ r -> pThread -> pMainPool, pHash, "starttag", NULL) ;
p -> pEndTag = (struct tToken *)GetHashValueStrDup (aTHX_ r -> pThread -> pMainPool, pHash, "endtag", NULL) ;
p -> sParseTimePerlCode = GetHashValueStrDup (aTHX_ r -> pThread -> pMainPool, pHash, "parsetimeperlcode", NULL) ;
- if (sC = sContains = GetHashValueStrDup (aTHX_ r -> pThread -> pMainPool, pHash, "contains", NULL))
+ if ((sC = sContains = GetHashValueStrDup (aTHX_ r -> pThread -> pMainPool, pHash, "contains", NULL)))
{
unsigned char * pC ;
if ((p -> pContains = parse_malloc (r, sizeof (tCharMap))) == NULL)
@@ -489,7 +489,7 @@
SV * args[2] ;
epTHX ;
- if (p = strnstr (sPCode, "%%", nLen))
+ if ((p = strnstr (sPCode, "%%", nLen)))
{
sCode = parse_malloc (r, nLen + plen + 1) ;
n = p - sPCode ;
@@ -582,7 +582,7 @@
char * pCurr = *ppCurr ;
char * pCurrStart = pCDATAStart?pCDATAStart:pCurr ;
tNode xNewNode ;
- int rc ;
+ int rc = 0 ;
tDomTree * pDomTree = DomTree_self (r -> Component.xCurrDomTree) ;
int numInside = 0 ;
@@ -695,7 +695,7 @@
}
- while (pNextTokenTab = pToken -> pFollowedBy) ;
+ while ((pNextTokenTab = pToken -> pFollowedBy)) ;
if (pToken)
{ /* matching token found */
@@ -802,7 +802,7 @@
xParentNode = Node_parentNode (r -> pApp, pDomTree, xParentNode, 0) ;
level-- ;
}
- if (pToken -> nNodeType && pToken -> nNodeType != ntypCDATA || pToken -> sNodeName)
+ if ((pToken -> nNodeType && pToken -> nNodeType != ntypCDATA) || pToken -> sNodeName)
{
/* add token as node if not cdata*/
tNodeType nType = pToken -> nNodeType ;
@@ -825,7 +825,7 @@
xNewNode = xParentNode ;
}
- if (pInside = pToken -> pInside)
+ if ((pInside = pToken -> pInside))
{ /* parse for further tokens inside of this token */
rc = ParseTokens (r, &pCurr, pEnd, pInside,
pToken -> sEndText,
@@ -880,7 +880,7 @@
{ /* nothing more inside of this token allowed, so search for the end of the token */
char * pEndCurr ;
unsigned char * pContains ;
- int nSkip ;
+ int nSkip = 0 ;
if ((pContains = pToken -> pContains))
{
pEndCurr = pCurr ;
@@ -1005,7 +1005,7 @@
return bInsideMustExist?rcNotFound:ok ;
}
else if (sEndText == NULL ||
- (*pCurr == *sEndText && (strncmp (pCurr, sEndText, nEndText) == 0) ||
+ ((*pCurr == *sEndText && (strncmp (pCurr, sEndText, nEndText) == 0)) ||
(pCurr[0] == '\n' && pCurr[1] == '\r' && pCurr[2] == '\n' && sEndText[1] == '\n' && sEndText[2] == '\0')) ||
(pCurr[0] == '\r' && pCurr[1] == '\n' && pCurr[2] == '\r' && pCurr[3] == '\n' && sEndText[0] == '\n' && sEndText[1] == '\n' && sEndText[2] == '\0')
)
1.3 +3 -3 embperl/epprovider.c
Index: epprovider.c
===================================================================
RCS file: /home/cvs/embperl/epprovider.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- epprovider.c 22 Oct 2002 05:29:06 -0000 1.2
+++ epprovider.c 30 Mar 2003 18:57:02 -0000 1.3
@@ -878,7 +878,7 @@
int rc ;
int num ;
SV * pSyntaxSV ;
- SV * pSyntaxRV ;
+ SV * pSyntaxRV = NULL ;
SV * pSyntaxPV ;
tTokenTable * pSyntax ;
const char * sSyntax = GetHashValueStr (aTHX_ pProviderParam, "syntax", r -> Component.Config.sSyntax) ;
@@ -1154,7 +1154,7 @@
/*if (r -> Config.bDebug)
lprintf (r -> pApp, "[%d]ep_acquire_mutex(PackageCountMutex)\n", r -> pThread -> nPid) ; */
- if (sPackage = GetHashValueStrDupA (aTHX_ pProviderParam, "package", r -> Component.Config.sPackage))
+ if ((sPackage = GetHashValueStrDupA (aTHX_ pProviderParam, "package", r -> Component.Config.sPackage)))
{
int n ;
ep_acquire_mutex(PackageCountMutex) ;
1.35 +3 -3 embperl/eputil.c
Index: eputil.c
===================================================================
RCS file: /home/cvs/embperl/eputil.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- eputil.c 30 Mar 2003 14:12:14 -0000 1.34
+++ eputil.c 30 Mar 2003 18:57:03 -0000 1.35
@@ -777,7 +777,7 @@
ppSV = hv_fetch(pHash, (char *)sKey, strlen (sKey), 0) ;
if (ppSV != NULL)
{
- if (s = SvPV (*ppSV, l))
+ if ((s = SvPV (*ppSV, l)))
return ep_pstrdup (pPool, s);
else
return NULL ;
@@ -801,7 +801,7 @@
ppSV = hv_fetch(pHash, (char *)sKey, strlen (sKey), 0) ;
if (ppSV != NULL)
{
- if (s = SvPV (*ppSV, l))
+ if ((s = SvPV (*ppSV, l)))
return strdup (s);
else
return NULL ;
1.10 +2 -2 embperl/mod_embperl.c
Index: mod_embperl.c
===================================================================
RCS file: /home/cvs/embperl/mod_embperl.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_embperl.c 27 Feb 2003 07:48:08 -0000 1.9
+++ mod_embperl.c 30 Mar 2003 18:57:03 -0000 1.10
@@ -599,7 +599,7 @@
#define EPCFG_BOOL(STRUCT,TYPE,NAME,CFGNAME) \
const char * embperl_Apache_Config_##STRUCT##NAME (cmd_parms *cmd, /* tApacheDirConfig */ void * pDirCfg, const char * arg) \
{ \
- ((tApacheDirConfig *)pDirCfg) -> STRUCT.NAME = (TYPE)arg ; \
+ ((tApacheDirConfig *)pDirCfg) -> STRUCT.NAME = (TYPE)(arg?1:0) ; \
((tApacheDirConfig *)pDirCfg) -> set_##STRUCT##NAME = 1 ; \
if (bApDebug) \
ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE NULL, "Embperl: Set "#CFGNAME" (type="#TYPE";BOOL) = %s\n", arg) ; \
1.11 +2 -2 embperl/typemap
Index: typemap
===================================================================
RCS file: /home/cvs/embperl/typemap,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- typemap 22 Oct 2002 05:29:06 -0000 1.10
+++ typemap 30 Mar 2003 18:57:03 -0000 1.11
@@ -25,7 +25,7 @@
T_PTROBJ_REQ
{
MAGIC * mg ;
- if (mg = mg_find (SvRV($arg), '~'))
+ if ((mg = mg_find (SvRV($arg), '~')))
$var = *((tReq **)(mg -> mg_ptr)) ;
else
croak (\"$var is not of type Embperl::Req\") ;
@@ -41,7 +41,7 @@
T_PTROBJ_DOMNODE
{
MAGIC * mg ;
- if (mg = mg_find (SvRV($arg), '~'))
+ if ((mg = mg_find (SvRV($arg), '~')))
$var = *((tDomNode **)(mg -> mg_ptr)) ;
else
croak (\"$var is not of type XML::Embperl::DOM::Node\") ;
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org