joes 2004/07/03 11:16:05
Modified: glue/perl/xsbuilder apreq_xs_postperl.h
glue/perl/xsbuilder/Apache/Request Apache__Request.h
glue/perl/xsbuilder/Apache/Upload Apache__Upload.h
Log:
style cleanups: fold code lines over 78 chars
Revision Changes Path
1.34 +17 -10 httpd-apreq-2/glue/perl/xsbuilder/apreq_xs_postperl.h
Index: apreq_xs_postperl.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/perl/xsbuilder/apreq_xs_postperl.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- apreq_xs_postperl.h 2 Jul 2004 16:04:33 -0000 1.33
+++ apreq_xs_postperl.h 3 Jul 2004 18:16:05 -0000 1.34
@@ -159,10 +159,12 @@
return sv_bless(newRV_noinc(sv), SvSTASH(SvRV(rv)));
}
+#define apreq_xs_2sv(t,class,parent) \
+ apreq_xs_c2perl(aTHX_ t, env, class, parent)
+
+#define apreq_xs_sv2(type,sv)((apreq_##type##_t *) \
+ apreq_xs_perl2c(aTHX_ sv, #type))
-#define apreq_xs_2sv(t,class,parent) apreq_xs_c2perl(aTHX_ t, env,
class,parent)
-#define apreq_xs_sv2(type,sv)((apreq_##type##_t *)apreq_xs_perl2c(aTHX_ sv, \
- #type))
#define apreq_xs_sv2env(sv) apreq_xs_perl2env(aTHX_ sv)
/** Converts apreq_env to a Perl package, which forms the
@@ -220,8 +222,8 @@
data = (items == 3) ? SvPV_nolen(ST(2)) : NULL; \
obj = apreq_##type(env, data); \
\
- ST(0) = obj ? sv_2mortal( apreq_xs_2sv(obj, SvPV_nolen(ST(0)),ST(1)) ) :
\
- &PL_sv_undef; \
+ ST(0) = obj ? sv_2mortal(apreq_xs_2sv(obj, SvPV_nolen(ST(0)),ST(1)))\
+ : &PL_sv_undef; \
XSRETURN(1); \
}
@@ -282,8 +284,11 @@
}
#define apreq_xs_sv2table(sv) ((apr_table_t *) SvIVX(SvRV(sv)))
-#define apreq_xs_table2sv(t,class,parent) apreq_xs_table_c2perl(aTHX_ t,
env, class,parent)
-#define apreq_xs_do(attr) (items == 1 ? apreq_xs_table_keys \
+
+#define apreq_xs_table2sv(t,class,parent) \
+ apreq_xs_table_c2perl(aTHX_ t, env, class, parent)
+
+#define apreq_xs_do(attr) (items == 1 ? apreq_xs_table_keys \
: apreq_xs_##attr##_table_values)
#define apreq_xs_push(attr,sv,d,key) do { \
@@ -323,7 +328,8 @@
apreq_##type##_t *RETVAL = \
apreq_value_to_##type(apreq_strtoval(val)); \
if (COND) \
-
XPUSHs(sv_2mortal(apreq_xs_##type##2sv(RETVAL,subclass,d->parent))); \
+ XPUSHs(sv_2mortal( \
+ apreq_xs_##type##2sv(RETVAL,subclass,d->parent))); \
} else \
XPUSHs(&PL_sv_undef); \
\
@@ -359,14 +365,15 @@
if (items == 1) { \
apr_table_t *t = apreq_xs_##attr##_sv2table(sv); \
if (t != NULL) \
- XPUSHs(sv_2mortal(apreq_xs_table2sv(t,class,sv))); \
+ XPUSHs(sv_2mortal(apreq_xs_table2sv(t,class,sv))); \
PUTBACK; \
break; \
} \
\
RETVAL = apreq_xs_##attr##_##type(sv, key); \
if (RETVAL && (COND)) \
- XPUSHs(sv_2mortal(apreq_xs_##type##2sv(RETVAL,subclass,sv))); \
+ XPUSHs(sv_2mortal( \
+ apreq_xs_##type##2sv(RETVAL,subclass,sv))); \
\
default: \
PUTBACK; \
1.34 +4 -4
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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Apache__Request.h 2 Jul 2004 04:40:08 -0000 1.33
+++ Apache__Request.h 3 Jul 2004 18:16:05 -0000 1.34
@@ -89,9 +89,8 @@
#define apreq_xs_table_error_check
-#define apreq_xs_param2rv(ptr, class, parent) apreq_xs_2sv(ptr,class,parent)
-#define apreq_xs_rv2param(sv) ((apreq_param_t *)SvIVX(SvRV(sv)))
-#define apreq_xs_param2sv(ptr,class,parent)
newSVpvn((ptr)->v.data,(ptr)->v.size)
+#define apreq_xs_param2sv(ptr, class, parent) \
+ newSVpvn((ptr)->v.data,(ptr)->v.size)
APREQ_XS_DEFINE_ENV(request);
APREQ_XS_DEFINE_OBJECT(request);
@@ -156,7 +155,8 @@
if (strcasecmp(attr,"POST_MAX")== 0
|| strcasecmp(attr, "MAX_BODY") == 0)
{
- status =
apreq_env_max_body(req->env,(apr_off_t)apreq_atoi64f(val));
+ status = apreq_env_max_body(req->env,
+ (apr_off_t)apreq_atoi64f(val));
}
else if (strcasecmp(attr, "TEMP_DIR") == 0) {
apreq_env_temp_dir(req->env, val);
1.13 +5 -4
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Apache__Upload.h 3 Jul 2004 15:45:53 -0000 1.12
+++ Apache__Upload.h 3 Jul 2004 18:16:05 -0000 1.13
@@ -445,7 +445,7 @@
s = apreq_file_mktemp(&file, apreq_env_pool(env), tmpdir);
if (s != APR_SUCCESS) {
- apreq_log(APREQ_ERROR s, env, "apreq_xs_upload_tempname:"
+ apreq_log(APREQ_ERROR s, env, "apreq_xs_upload_tempname: "
"apreq_file_mktemp failed");
Perl_croak(aTHX_ "$upload->tempname: can't make tempfile");
}
@@ -453,9 +453,10 @@
s = apreq_brigade_fwrite(file, &len, bb);
if (s != APR_SUCCESS) {
- apreq_log(APREQ_ERROR s, env, "apreq_xs_upload_tempname:"
+ apreq_log(APREQ_ERROR s, env, "apreq_xs_upload_tempname: "
"apreq_brigade_fwrite failed");
- Perl_croak(aTHX_ "$upload->tempname: can't write brigade to
tempfile");
+ Perl_croak(aTHX_ "$upload->tempname: "
+ "can't write brigade to tempfile");
}
last = apr_bucket_file_create(file, len, 0, bb->p, bb->bucket_alloc);
@@ -564,7 +565,7 @@
SvPVX(ctx->bucket_data) = (char *)data;
SvCUR(ctx->bucket_data) = (STRLEN)len;
- eval_upload_hook(aTHX_ ctx->hook, ctx->upload, ctx->bucket_data,
+ eval_upload_hook(aTHX_ ctx->hook, ctx->upload, ctx->bucket_data,
ctx->hook_data);
if (SvTRUE(ERRSV)) {
