richter 2004/08/15 20:39:01
Modified: . Embperl.xs epapfilter.c epdom.c epinit.c epmain.c
epparse.c eputil.c mod_embperl.c
Embperl Object.pm
Log:
avoid some compiler warnings
Revision Changes Path
1.56 +28 -1 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- Embperl.xs 15 Mar 2004 06:21:31 -0000 1.55
+++ Embperl.xs 16 Aug 2004 03:38:59 -0000 1.56
@@ -46,7 +46,31 @@
#endif
-
+#ifdef DMALLOC
+
+unsigned long
+embperl_dmalloc_mark()
+CODE:
+ RETVAL = dmalloc_mark () ;
+OUTPUT:
+ RETVAL
+
+
+void
+embperl_dmalloc_check(nMemCheckpoint,txt)
+ unsigned long nMemCheckpoint
+ char * txt
+CODE:
+ if (nMemCheckpoint)
+ {
+ if (txt && *txt)
+ dmalloc_message (txt) ;
+ dmalloc_log_changed (nMemCheckpoint, 1, 0, 1) ;
+ }
+
+#endif
+
+
MODULE = Embperl::Req PACKAGE = Embperl::Req PREFIX = embperl_
@@ -88,6 +112,9 @@
RETVAL
+
+
+
INCLUDE: Old.xs
1.5 +2 -2 embperl/epapfilter.c
Index: epapfilter.c
===================================================================
RCS file: /home/cvs/embperl/epapfilter.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- epapfilter.c 23 Jan 2004 06:50:54 -0000 1.4
+++ epapfilter.c 16 Aug 2004 03:38:59 -0000 1.5
@@ -194,7 +194,7 @@
static apr_status_t ProviderApOutFilter_Callback(ap_filter_t *f, apr_bucket_brigade
*bb)
{
- request_rec *ap_r = f->r;
+ /*request_rec *ap_r = f->r;*/
struct tProviderApOutFilter_CallbackData * ctx = (struct
tProviderApOutFilter_CallbackData *)(f->ctx);
tReq * r = ctx -> pReq ;
apr_bucket *b;
1.20 +1 -1 embperl/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/epdom.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- epdom.c 14 Aug 2004 14:28:41 -0000 1.19
+++ epdom.c 16 Aug 2004 03:38:59 -0000 1.20
@@ -305,7 +305,7 @@
void * m = ((size_t *)s) - 1 ;
size_t * m_size;
nMemUsage -= *((size_t *)m) ;
- if (m = _realloc_leap (fn, l, m, n + sizeof (size_t)))
+ if ((m = _realloc_leap (fn, l, m, n + sizeof (size_t))))
{
nMemUsage += n ;
/* make the following in multiple step, so sun-cc is happy... */
1.17 +0 -2 embperl/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/epinit.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- epinit.c 14 Aug 2004 14:28:42 -0000 1.16
+++ epinit.c 16 Aug 2004 03:39:00 -0000 1.17
@@ -979,8 +979,6 @@
AV * pFormArray = r -> pThread -> pFormArray ;
HV * pFormHash = r -> pThread -> pFormHash ;
- HV * pFormSplitHash = r -> pThread -> pFormSplitHash ;
- HV * pInputHash = r -> pThread -> pInputHash ;
bool bAll = (r -> Config.bOptions & optAllFormData) != 0 ;
bool bDebug = (r -> Config.bDebug & dbgForm) != 0 ;
epTHX ;
1.130 +0 -16 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- epmain.c 15 Aug 2004 19:26:48 -0000 1.129
+++ epmain.c 16 Aug 2004 03:39:00 -0000 1.130
@@ -1537,22 +1537,6 @@
LEAVE;
c -> bReqRunning = 0 ;
-#ifdef DMALLOC
- {
- static unsigned long nMemCheckpoint ;
- if (nMemCheckpoint)
- {
- dmalloc_message ( "***TO PREVIOUS REQUEST IN RUN***\n") ;
- dmalloc_log_changed (nMemCheckpoint, 1, 0, 1) ;
- }
- nMemCheckpoint = dmalloc_mark () ;
- }
-#endif
-
-
-
-
-
return rc ;
}
1.12 +4 -3 embperl/epparse.c
Index: epparse.c
===================================================================
RCS file: /home/cvs/embperl/epparse.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- epparse.c 14 Mar 2004 18:54:43 -0000 1.11
+++ epparse.c 16 Aug 2004 03:39:00 -0000 1.12
@@ -611,7 +611,6 @@
{ /* valid token start char found */
struct tTokenTable * pNextTokenTab = pTokenTable ;
tStringIndex nNodeName = 0 ;
- tNodeType nNodeType = 0 ;
char * pCurrTokenStart = pCurr ;
@@ -913,13 +912,15 @@
if (strcmp (pToken -> sEndText, "\n\n") == 0)
{
if (pEndCurr = strstr (pCurr, "\n\r\n"))
+ {
if (pEndCurr[-1] == '\r')
{
pEndCurr-- ;
nSkip = pCurr[4] == '\r'?5:4 ;
}
else
- nSkip = pCurr[3] == '\r'?4:3 ;
+ nSkip = pCurr[3] == '\r'?4:3 ;
+ }
}
if (!pEndCurr)
{
1.40 +9 -3 embperl/eputil.c
Index: eputil.c
===================================================================
RCS file: /home/cvs/embperl/eputil.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- eputil.c 14 Aug 2004 14:28:43 -0000 1.39
+++ eputil.c 16 Aug 2004 03:39:00 -0000 1.40
@@ -631,10 +631,12 @@
if (strnicmp (pTag, pArg, l) == 0 && (pTag[l] == '=' || isspace (pTag[l])
|| pTag[l] == '>' || pTag[l] == '\0'))
+ {
if (*pLen > 0)
return pVal ;
else
return pTag ;
+ }
pTag = pEnd ;
}
@@ -826,10 +828,12 @@
ppSV = hv_fetch(pHash, (char *)sKey, strlen (sKey), 0) ;
if (ppSV != NULL)
+ {
if (!SvROK(*ppSV) || SvTYPE (SvRV(*ppSV)) != SVt_PVHV)
*sValue = SvPV (*ppSV, l), *pHV = NULL ;
else
- *pHV = (HV *)SvRV(*ppSV), *sValue = NULL ;
+ *pHV = (HV *)SvRV(*ppSV), *sValue = NULL ;
+ }
}
@@ -1471,7 +1475,9 @@
/*in*/ const char * sFilename)
{
epTHX_
+#ifdef WIN32
char * c ;
+#endif
char * sAbsname ;
if (sFilename == NULL)
@@ -1812,10 +1818,10 @@
epTHX_
char * pMsg ;
- if (pMsg = embperl_GetText1(r, sMsgId, r -> pMessages))
+ if ((pMsg = embperl_GetText1(r, sMsgId, r -> pMessages)))
return pMsg ;
- if (pMsg = embperl_GetText1(r, sMsgId, r -> pDefaultMessages))
+ if ((pMsg = embperl_GetText1(r, sMsgId, r -> pDefaultMessages)))
return pMsg ;
return sMsgId ;
1.19 +2 -3 embperl/mod_embperl.c
Index: mod_embperl.c
===================================================================
RCS file: /home/cvs/embperl/mod_embperl.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mod_embperl.c 15 Aug 2004 19:26:48 -0000 1.18
+++ mod_embperl.c 16 Aug 2004 03:39:00 -0000 1.19
@@ -286,7 +286,6 @@
#endif
{
- int rc ;
apr_pool_t * subpool ;
dTHX ;
@@ -348,7 +347,7 @@
{
module * m ;
/* make sure embperl module is removed before mod_perl in case mod_perl is
loaded dynamicly*/
- if (m = ap_find_linked_module("mod_perl.c"))
+ if ((m = ap_find_linked_module("mod_perl.c")))
{
if (m -> dynamic_load_handle)
{
@@ -1088,7 +1087,7 @@
pParam -> sUri = r -> uri ;
pParam -> sPathInfo = r -> path_info ;
pParam -> sQueryInfo = r -> args ;
- if (p = ep_pstrdup (pPool, ap_table_get (r -> headers_in, "Accept-Language")))
+ if ((p = ep_pstrdup (pPool, ap_table_get (r -> headers_in, "Accept-Language"))))
{
while (isspace(*p))
p++ ;
1.9 +3 -1 embperl/Embperl/Object.pm
Index: Object.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Object.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Object.pm 2 Apr 2004 06:51:34 -0000 1.8
+++ Object.pm 16 Aug 2004 03:39:01 -0000 1.9
@@ -108,7 +108,9 @@
$req{'req_rec'} = $_[0] ;
+ my $n = Embperl::dmalloc_mark () ;
Execute (\%req) ;
+ Embperl::dmalloc_check ($n, "Embperl::Object") ;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
