dougm 01/03/04 10:49:39
Modified: src/modules/perl modperl_gtop.c modperl_options.c
modperl_tipool.c
Log:
untabify
Revision Changes Path
1.6 +7 -7 modperl-2.0/src/modules/perl/modperl_gtop.c
Index: modperl_gtop.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_gtop.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- modperl_gtop.c 2001/02/08 19:42:11 1.5
+++ modperl_gtop.c 2001/03/04 18:49:38 1.6
@@ -11,19 +11,19 @@
apr_snprintf(size_string, MP_GTOP_SSS, "0k");
}
else if (size < 1024) {
- apr_snprintf(size_string, MP_GTOP_SSS, "1k");
+ apr_snprintf(size_string, MP_GTOP_SSS, "1k");
}
else if (size < 1048576) {
- apr_snprintf(size_string, MP_GTOP_SSS, "%dk",
- (size + 512) / 1024);
+ apr_snprintf(size_string, MP_GTOP_SSS, "%dk",
+ (size + 512) / 1024);
}
else if (size < 103809024) {
- apr_snprintf(size_string, MP_GTOP_SSS, "%.1fM",
- size / 1048576.0);
+ apr_snprintf(size_string, MP_GTOP_SSS, "%.1fM",
+ size / 1048576.0);
}
else {
- apr_snprintf(size_string, MP_GTOP_SSS, "%dM",
- (size + 524288) / 1048576);
+ apr_snprintf(size_string, MP_GTOP_SSS, "%dM",
+ (size + 524288) / 1048576);
}
return 1;
1.3 +15 -13 modperl-2.0/src/modules/perl/modperl_options.c
Index: modperl_options.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_options.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- modperl_options.c 2000/08/14 03:10:45 1.2
+++ modperl_options.c 2001/03/04 18:49:39 1.3
@@ -65,21 +65,23 @@
memcpy((char *)conf, (const char *)base, sizeof(*base));
if (add->opts & add->unset) {
- /* there was no explicit setting of add->opts, so we merge
- * preserve the invariant (opts_add & opts_remove) == 0
- */
- conf->opts_add = (conf->opts_add & ~add->opts_remove) | add->opts_add;
- conf->opts_remove = (conf->opts_remove & ~add->opts_add)
- | add->opts_remove;
- conf->opts = (conf->opts & ~conf->opts_remove) | conf->opts_add;
+ /* there was no explicit setting of add->opts, so we merge
+ * preserve the invariant (opts_add & opts_remove) == 0
+ */
+ conf->opts_add =
+ (conf->opts_add & ~add->opts_remove) | add->opts_add;
+ conf->opts_remove =
+ (conf->opts_remove & ~add->opts_add) | add->opts_remove;
+ conf->opts =
+ (conf->opts & ~conf->opts_remove) | conf->opts_add;
}
else {
- /* otherwise we just copy, because an explicit opts setting
- * overrides all earlier +/- modifiers
- */
- conf->opts = add->opts;
- conf->opts_add = add->opts_add;
- conf->opts_remove = add->opts_remove;
+ /* otherwise we just copy, because an explicit opts setting
+ * overrides all earlier +/- modifiers
+ */
+ conf->opts = add->opts;
+ conf->opts_add = add->opts_add;
+ conf->opts_remove = add->opts_remove;
}
return conf;
1.6 +2 -2 modperl-2.0/src/modules/perl/modperl_tipool.c
Index: modperl_tipool.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_tipool.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- modperl_tipool.c 2000/08/14 03:10:45 1.5
+++ modperl_tipool.c 2001/03/04 18:49:39 1.6
@@ -100,7 +100,7 @@
}
break;
- }
+ }
}
#ifdef MP_TRACE
@@ -137,7 +137,7 @@
}
break;
- }
+ }
}
return list;
