joes 2004/08/29 16:25:44
Modified: glue/perl/xsbuilder apreq_xs_tables.h
glue/perl/xsbuilder/Apache/Cookie Apache__Cookie.h
glue/perl/xsbuilder/Apache/Request Apache__Request.h
glue/perl/xsbuilder/Apache/Upload Apache__Upload.h
Log:
Remove conditional from apreq_xs_table2sv because gcc may issue a warning
here, which breaks compiles with -Werror set.
Revision Changes Path
1.37 +5 -5 httpd-apreq-2/glue/perl/xsbuilder/apreq_xs_tables.h
Index: apreq_xs_tables.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/perl/xsbuilder/apreq_xs_tables.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- apreq_xs_tables.h 8 Aug 2004 18:42:06 -0000 1.36
+++ apreq_xs_tables.h 29 Aug 2004 23:25:44 -0000 1.37
@@ -90,11 +90,11 @@
#define apreq_xs_sv2table(sv) ((apr_table_t *) SvIVX(SvRV(sv)))
-#define apreq_xs_table2sv(t,class,parent,name,tainted) \
- apreq_xs_table_c2perl(aTHX_ t, name, name ? strlen(name) : 0, class,
parent, tainted)
+#define apreq_xs_table2sv(t,class,parent,name,nlen,tainted) \
+ apreq_xs_table_c2perl(aTHX_ t, name, nlen, class, parent, tainted)
-#define APREQ_XS_DEFINE_TABLE_MAKE(attr,pkg) \
+#define APREQ_XS_DEFINE_TABLE_MAKE(attr,pkg, plen) \
static XS(apreq_xs_table_##attr##_make) \
{ \
\
@@ -112,7 +112,7 @@
parent = SvRV(ST(1)); \
env = (void *)SvIVX(parent); \
t = apr_table_make(apreq_env_pool(env), APREQ_NELTS); \
- sv = apreq_xs_table2sv(t, class, parent, pkg, SvTAINTED(parent)); \
+ sv = apreq_xs_table2sv(t, class, parent, pkg, plen, SvTAINTED(parent));
\
XSprePUSH; \
PUSHs(sv); \
XSRETURN(1); \
@@ -290,7 +290,7 @@
apr_table_t *t = apreq_xs_##attr##_sv2table(obj); \
if (t != NULL) { \
SV *tsv = apreq_xs_table2sv(t, class, d.parent, \
- d.pkg, d.tainted); \
+ d.pkg, d.pkg ? strlen(d.pkg) : 0, d.tainted); \
PUSHs(sv_2mortal(tsv)); \
} \
PUTBACK; \
1.36 +1 -1
httpd-apreq-2/glue/perl/xsbuilder/Apache/Cookie/Apache__Cookie.h
Index: Apache__Cookie.h
===================================================================
RCS file:
/home/cvs/httpd-apreq-2/glue/perl/xsbuilder/Apache/Cookie/Apache__Cookie.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Apache__Cookie.h 8 Aug 2004 18:42:06 -0000 1.35
+++ Apache__Cookie.h 29 Aug 2004 23:25:44 -0000 1.36
@@ -97,7 +97,7 @@
APREQ_XS_DEFINE_TABLE_FETCH(table, cookie, COOKIE_PKG);
APREQ_XS_DEFINE_TABLE_DO(table, cookie, COOKIE_PKG);
-APREQ_XS_DEFINE_TABLE_MAKE(jar, COOKIE_PKG);
+APREQ_XS_DEFINE_TABLE_MAKE(jar, COOKIE_PKG, strlen(COOKIE_PKG));
APREQ_XS_DEFINE_TABLE_METHOD_N(cookie,set);
APREQ_XS_DEFINE_TABLE_METHOD_N(cookie,add);
APREQ_XS_DEFINE_TABLE_NEXTKEY(table);
1.57 +1 -1
httpd-apreq-2/glue/perl/xsbuilder/Apache/Request/Apache__Request.h
Index: Apache__Request.h
===================================================================
RCS file:
/home/cvs/httpd-apreq-2/glue/perl/xsbuilder/Apache/Request/Apache__Request.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- Apache__Request.h 8 Aug 2004 18:42:06 -0000 1.56
+++ Apache__Request.h 29 Aug 2004 23:25:44 -0000 1.57
@@ -174,7 +174,7 @@
APREQ_XS_DEFINE_TABLE_DO(table, param, NULL);
APREQ_XS_DEFINE_TABLE_NEXTKEY(table);
-APREQ_XS_DEFINE_TABLE_MAKE(request, NULL);
+APREQ_XS_DEFINE_TABLE_MAKE(request, NULL, 0);
APREQ_XS_DEFINE_TABLE_METHOD_N(param,set);
APREQ_XS_DEFINE_TABLE_METHOD_N(param,add);
1.37 +1 -1
httpd-apreq-2/glue/perl/xsbuilder/Apache/Upload/Apache__Upload.h
Index: Apache__Upload.h
===================================================================
RCS file:
/home/cvs/httpd-apreq-2/glue/perl/xsbuilder/Apache/Upload/Apache__Upload.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Apache__Upload.h 5 Aug 2004 18:11:47 -0000 1.36
+++ Apache__Upload.h 29 Aug 2004 23:25:44 -0000 1.37
@@ -100,7 +100,7 @@
APREQ_XS_DEFINE_TABLE_DO(upload_table, param, UPLOAD_PKG);
APREQ_XS_DEFINE_ENV(upload);
-APREQ_XS_DEFINE_TABLE_MAKE(request, UPLOAD_PKG);
+APREQ_XS_DEFINE_TABLE_MAKE(request, UPLOAD_PKG, strlen(UPLOAD_PKG));
APREQ_XS_DEFINE_TABLE_METHOD_N(param,add);
APREQ_XS_DEFINE_TABLE_METHOD_N(param,set);
APREQ_XS_DEFINE_TABLE_NEXTKEY(upload_table);
