You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by to...@apache.org on 2008/06/30 18:51:31 UTC
svn commit: r672819 - in /perl/modperl/trunk: src/modules/perl/mod_perl.c
src/modules/perl/modperl_env.c src/modules/perl/modperl_perl_global.c
src/modules/perl/modperl_util.c xs/Apache2/Access/Apache2__Access.h
xs/Apache2/Directive/Apache2__Directive.h
Author: torsten
Date: Mon Jun 30 09:51:30 2008
New Revision: 672819
URL: http://svn.apache.org/viewvc?rev=672819&view=rev
Log:
silence some "unused" warnings
Modified:
perl/modperl/trunk/src/modules/perl/mod_perl.c
perl/modperl/trunk/src/modules/perl/modperl_env.c
perl/modperl/trunk/src/modules/perl/modperl_perl_global.c
perl/modperl/trunk/src/modules/perl/modperl_util.c
perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h
perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h
Modified: perl/modperl/trunk/src/modules/perl/mod_perl.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/mod_perl.c?rev=672819&r1=672818&r2=672819&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/mod_perl.c (original)
+++ perl/modperl/trunk/src/modules/perl/mod_perl.c Mon Jun 30 09:51:30 2008
@@ -586,7 +586,7 @@
/* PERL_SYS_TERM() needs 'my_perl' as of 5.9.5 */
#if MP_PERL_VERSION_AT_LEAST(5, 9, 5) && defined(USE_ITHREADS)
modperl_cleanup_data_t *cdata = (modperl_cleanup_data_t *)data;
- PerlInterpreter *my_perl = cdata == NULL ? NULL : (PerlInterpreter *)cdata->data;
+ PERL_UNUSED_DECL PerlInterpreter *my_perl = cdata == NULL ? NULL : (PerlInterpreter *)cdata->data;
#endif
MP_init_status = 0;
MP_threads_started = 0;
Modified: perl/modperl/trunk/src/modules/perl/modperl_env.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_env.c?rev=672819&r1=672818&r2=672819&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_env.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_env.c Mon Jun 30 09:51:30 2008
@@ -43,7 +43,7 @@
} \
else { \
SV *sv = newSVpv(val, 0); \
- hv_store(hv, key, klen, sv, FALSE); \
+ (void)hv_store(hv, key, klen, sv, FALSE); \
modperl_envelem_tie(sv, key, klen); \
svp = &sv; \
} \
@@ -62,7 +62,7 @@
{
I32 klen = strlen(key);
if (hv_exists(hv, key, klen)) {
- hv_delete(hv, key, strlen(key), G_DISCARD);
+ (void)hv_delete(hv, key, strlen(key), G_DISCARD);
}
}
@@ -335,8 +335,8 @@
while (ent->key) {
SV *sv = newSVpvn(ent->val, ent->vlen);
- hv_store(hv, ent->key, ent->klen,
- sv, ent->hash);
+ (void)hv_store(hv, ent->key, ent->klen,
+ sv, ent->hash);
MP_TRACE_e(MP_FUNC, "$ENV{%s} = \"%s\";", ent->key, ent->val);
modperl_envelem_tie(sv, ent->key, ent->klen);
ent++;
Modified: perl/modperl/trunk/src/modules/perl/modperl_perl_global.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_perl_global.c?rev=672819&r1=672818&r2=672819&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_perl_global.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_perl_global.c Mon Jun 30 09:51:30 2008
@@ -272,8 +272,8 @@
while ((entry = hv_iternext(ohv))) {
SV *sv = newSVsv(HeVAL(entry));
modperl_envelem_tie(sv, HeKEY(entry), HeKLEN(entry));
- hv_store(hv, HeKEY(entry), HeKLEN(entry),
- sv, HeHASH(entry));
+ (void)hv_store(hv, HeKEY(entry), HeKLEN(entry),
+ sv, HeHASH(entry));
}
HvRITER(ohv) = hv_riter;
Modified: perl/modperl/trunk/src/modules/perl/modperl_util.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_util.c?rev=672819&r1=672818&r2=672819&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_util.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_util.c Mon Jun 30 09:51:30 2008
@@ -746,7 +746,7 @@
{
int len;
char *filename = package2filename(package, &len);
- hv_delete(GvHVn(PL_incgv), filename, len, G_DISCARD);
+ (void)hv_delete(GvHVn(PL_incgv), filename, len, G_DISCARD);
free(filename);
}
@@ -776,7 +776,7 @@
* unload
*/
if (GvSTASH(val) == stash) {
- hv_delete(stash, key, len, G_DISCARD);
+ (void)hv_delete(stash, key, len, G_DISCARD);
}
}
}
Modified: perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h?rev=672819&r1=672818&r2=672819&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h (original)
+++ perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h Mon Jun 30 09:51:30 2008
@@ -37,11 +37,11 @@
hv = newHV();
- hv_store(hv, "method_mask", 11,
- newSViv((IV)reqs[x].method_mask), 0);
+ (void)hv_store(hv, "method_mask", 11,
+ newSViv((IV)reqs[x].method_mask), 0);
- hv_store(hv, "requirement", 11,
- newSVpv(reqs[x].requirement,0), 0);
+ (void)hv_store(hv, "requirement", 11,
+ newSVpv(reqs[x].requirement,0), 0);
av_push(av, newRV_noinc((SV*)hv));
}
Modified: perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h?rev=672819&r1=672818&r2=672819&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h (original)
+++ perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h Mon Jun 30 09:51:30 2008
@@ -46,13 +46,13 @@
if (value) {
if (!hash_ent) {
subhash = newHV();
- hv_store(hash, key, keylen, newRV_noinc((SV *)subhash), 0);
+ (void)hv_store(hash, key, keylen, newRV_noinc((SV *)subhash), 0);
}
else {
subhash = (HV *)SvRV(*hash_ent);
}
- hv_store(subhash, args, argslen, value, 0);
+ (void)hv_store(subhash, args, argslen, value, 0);
}
else {
if (hash_ent) {
@@ -62,12 +62,13 @@
else {
args_array = newAV();
av_push(args_array, newSVsv(*hash_ent));
- hv_store(hash, key, keylen, newRV_noinc((SV *)args_array), 0);
+ (void)hv_store(hash, key, keylen,
+ newRV_noinc((SV *)args_array), 0);
}
av_push(args_array, newSVpv(args, argslen));
}
else {
- hv_store(hash, key, keylen, newSVpv(args, argslen), 0);
+ (void)hv_store(hash, key, keylen, newSVpv(args, argslen), 0);
}
}
}
Re: svn commit: r672819 - in /perl/modperl/trunk: src/modules/perl/mod_perl.c
src/modules/perl/modperl_env.c src/modules/perl/modperl_perl_global.c src/modules/perl/modperl_util.c
xs/Apache2/Access/Apache2__Access.h xs/Apache2/Directive/Apache2__Directive.h
Posted by "Philippe M. Chiasson" <go...@ectoplasm.org>.
Philip M. Gollucci wrote:
> Philippe M. Chiasson wrote:
>> torsten@apache.org wrote:
>>> Author: torsten
>>> Date: Mon Jun 30 09:51:30 2008
>>> New Revision: 672819
>>>
>>> URL: http://svn.apache.org/viewvc?rev=672819&view=rev
>>> Log:
>>> silence some "unused" warnings
>>>
>>> Modified:
>>> perl/modperl/trunk/src/modules/perl/mod_perl.c
>>> perl/modperl/trunk/src/modules/perl/modperl_env.c
>>> perl/modperl/trunk/src/modules/perl/modperl_perl_global.c
>>> perl/modperl/trunk/src/modules/perl/modperl_util.c
>>> perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h
>>> perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h
>>>
>> Shouldn't this change have been applied to trunk/ and then svnmerged to
>> the threading/ branch ?
>>
>> Otherwise, the next person to svnmerge will almost certainly get a nasty
>> merge conflict. It's also fixable after the fact with 'svnmerge block'.
>>
> Does that matter until everyone updates clients to 1.5.x ?
Not sure what svn 1.5.x changes in this case ?
--
Philippe M. Chiasson GPG: F9BFE0C2480E7680 1AE53631CB32A107 88C3A5A5
http://gozer.ectoplasm.org/ m/gozer\@(apache|cpan|ectoplasm)\.org/
Re: svn commit: r672819 - in /perl/modperl/trunk: src/modules/perl/mod_perl.c
src/modules/perl/modperl_env.c src/modules/perl/modperl_perl_global.c src/modules/perl/modperl_util.c
xs/Apache2/Access/Apache2__Access.h xs/Apache2/Directive/Apache2__Directive.h
Posted by "Philip M. Gollucci" <pg...@p6m7g8.com>.
Philippe M. Chiasson wrote:
> torsten@apache.org wrote:
>> Author: torsten
>> Date: Mon Jun 30 09:51:30 2008
>> New Revision: 672819
>>
>> URL: http://svn.apache.org/viewvc?rev=672819&view=rev
>> Log:
>> silence some "unused" warnings
>>
>> Modified:
>> perl/modperl/trunk/src/modules/perl/mod_perl.c
>> perl/modperl/trunk/src/modules/perl/modperl_env.c
>> perl/modperl/trunk/src/modules/perl/modperl_perl_global.c
>> perl/modperl/trunk/src/modules/perl/modperl_util.c
>> perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h
>> perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h
>>
>
> Shouldn't this change have been applied to trunk/ and then svnmerged to
> the threading/ branch ?
>
> Otherwise, the next person to svnmerge will almost certainly get a nasty
> merge conflict. It's also fixable after the fact with 'svnmerge block'.
>
Does that matter until everyone updates clients to 1.5.x ?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: svn commit: r672819 - in /perl/modperl/trunk: src/modules/perl/mod_perl.c
src/modules/perl/modperl_env.c src/modules/perl/modperl_perl_global.c src/modules/perl/modperl_util.c
xs/Apache2/Access/Apache2__Access.h xs/Apache2/Directive/Apache2__Directive.h
Posted by "Philippe M. Chiasson" <go...@ectoplasm.org>.
torsten@apache.org wrote:
> Author: torsten
> Date: Mon Jun 30 09:51:30 2008
> New Revision: 672819
>
> URL: http://svn.apache.org/viewvc?rev=672819&view=rev
> Log:
> silence some "unused" warnings
>
> Modified:
> perl/modperl/trunk/src/modules/perl/mod_perl.c
> perl/modperl/trunk/src/modules/perl/modperl_env.c
> perl/modperl/trunk/src/modules/perl/modperl_perl_global.c
> perl/modperl/trunk/src/modules/perl/modperl_util.c
> perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h
> perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h
>
Shouldn't this change have been applied to trunk/ and then svnmerged to
the threading/ branch ?
Otherwise, the next person to svnmerge will almost certainly get a nasty
merge conflict. It's also fixable after the fact with 'svnmerge block'.
--
Philippe M. Chiasson GPG: F9BFE0C2480E7680 1AE53631CB32A107 88C3A5A5
http://gozer.ectoplasm.org/ m/gozer\@(apache|cpan|ectoplasm)\.org/