httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r290160 - in /httpd/test/trunk/perl-framework/c-modules: echo_post/mod_echo_post.c echo_post_chunk/mod_echo_post_chunk.c test_pass_brigade/mod_test_pass_brigade.c test_rwrite/mod_test_rwrite.c
Date Mon, 19 Sep 2005 13:53:05 GMT
Author: jorton
Date: Mon Sep 19 06:52:57 2005
New Revision: 290160

URL: http://svn.apache.org/viewcvs?rev=290160&view=rev
Log:
- fix mismatched format string warnings throughout

Modified:
    httpd/test/trunk/perl-framework/c-modules/echo_post/mod_echo_post.c
    httpd/test/trunk/perl-framework/c-modules/echo_post_chunk/mod_echo_post_chunk.c
    httpd/test/trunk/perl-framework/c-modules/test_pass_brigade/mod_test_pass_brigade.c
    httpd/test/trunk/perl-framework/c-modules/test_rwrite/mod_test_rwrite.c

Modified: httpd/test/trunk/perl-framework/c-modules/echo_post/mod_echo_post.c
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/c-modules/echo_post/mod_echo_post.c?rev=290160&r1=290159&r2=290160&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/c-modules/echo_post/mod_echo_post.c (original)
+++ httpd/test/trunk/perl-framework/c-modules/echo_post/mod_echo_post.c Mon Sep 19 06:52:57
2005
@@ -42,22 +42,23 @@
 #endif
     
     if (r->args) {
-        ap_rprintf(r, "%ld:", r->remaining);
+        ap_rprintf(r, "%" APR_OFF_T_FMT ":", r->remaining);
     }
 
-    fprintf(stderr, "[mod_echo_post] going to echo %ld bytes\n",
+    fprintf(stderr, "[mod_echo_post] going to echo %" APR_OFF_T_FMT " bytes\n",
             r->remaining);
 
     while ((nrd = ap_get_client_block(r, buff, sizeof(buff))) > 0) {
         fprintf(stderr,
-                "[mod_echo_post] read %ld bytes (wanted %d, remaining=%ld)\n",
+                "[mod_echo_post] read %ld bytes (wanted %" APR_SIZE_T_FMT 
+                ", remaining=%" APR_OFF_T_FMT ")\n",
                 nrd, sizeof(buff), r->remaining);
         ap_rwrite(buff, nrd, r);
         total += nrd;
     }
 
     fprintf(stderr,
-            "[mod_echo_post] done reading %ld bytes, %ld bytes remain\n",
+            "[mod_echo_post] done reading %ld bytes, %" APR_OFF_T_FMT " bytes remain\n",
             total, r->remaining);
     
     return OK;

Modified: httpd/test/trunk/perl-framework/c-modules/echo_post_chunk/mod_echo_post_chunk.c
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/c-modules/echo_post_chunk/mod_echo_post_chunk.c?rev=290160&r1=290159&r2=290160&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/c-modules/echo_post_chunk/mod_echo_post_chunk.c (original)
+++ httpd/test/trunk/perl-framework/c-modules/echo_post_chunk/mod_echo_post_chunk.c Mon Sep
19 06:52:57 2005
@@ -39,15 +39,17 @@
     }
 
     if (r->args) {
-        ap_rprintf(r, "%ld:", r->remaining);
+        ap_rprintf(r, "%" APR_OFF_T_FMT ":", r->remaining);
     }
 
-    fprintf(stderr, "[mod_echo_post_chunk] going to echo %ld bytes\n",
+    fprintf(stderr, "[mod_echo_post_chunk] going to echo "
+            "%" APR_OFF_T_FMT " bytes\n",
             r->remaining);
 
     while ((nrd = ap_get_client_block(r, buff, sizeof(buff))) > 0) {
         fprintf(stderr,
-                "[mod_echo_post_chunk] read %ld bytes (wanted %d, remaining=%ld)\n",
+                "[mod_echo_post_chunk] read %ld bytes "
+                "(wanted %" APR_SIZE_T_FMT ", remaining=%" APR_OFF_T_FMT ")\n",
                 nrd, sizeof(buff), r->remaining);
         total += nrd;
     }
@@ -74,7 +76,8 @@
     ap_rputs(trailer_header, r);
 
     fprintf(stderr,
-            "[mod_echo_post_chunk] done reading %ld bytes, %ld bytes remain\n",
+            "[mod_echo_post_chunk] done reading %ld bytes, "
+            "%" APR_OFF_T_FMT " bytes remain\n",
             total, r->remaining);
     
     return OK;

Modified: httpd/test/trunk/perl-framework/c-modules/test_pass_brigade/mod_test_pass_brigade.c
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/c-modules/test_pass_brigade/mod_test_pass_brigade.c?rev=290160&r1=290159&r2=290160&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/c-modules/test_pass_brigade/mod_test_pass_brigade.c (original)
+++ httpd/test/trunk/perl-framework/c-modules/test_pass_brigade/mod_test_pass_brigade.c Mon
Sep 19 06:52:57 2005
@@ -39,7 +39,8 @@
     httpd_test_split_qs_numbers(r, &buff_size, &remaining, NULL);
 
     fprintf(stderr, "[mod_test_pass_brigade] "
-            "going to echo %lu bytes with buffer size=%lu\n",
+            "going to echo %" APR_SIZE_T_FMT " bytes with "
+            "buffer size=%" APR_SIZE_T_FMT "\n",
             remaining, buff_size);
 
     buff = malloc(buff_size);
@@ -75,7 +76,8 @@
     
     apr_brigade_destroy(bb);
     fprintf(stderr,
-            "[mod_test_pass_brigade] done writing %ld of %ld bytes\n",
+            "[mod_test_pass_brigade] done writing %" APR_SIZE_T_FMT 
+            " of %" APR_SIZE_T_FMT " bytes\n",
             total, remaining);
 
     free(buff);    

Modified: httpd/test/trunk/perl-framework/c-modules/test_rwrite/mod_test_rwrite.c
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/c-modules/test_rwrite/mod_test_rwrite.c?rev=290160&r1=290159&r2=290160&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/c-modules/test_rwrite/mod_test_rwrite.c (original)
+++ httpd/test/trunk/perl-framework/c-modules/test_rwrite/mod_test_rwrite.c Mon Sep 19 06:52:57
2005
@@ -36,7 +36,7 @@
 
     httpd_test_split_qs_numbers(r, &buff_size, &remaining, NULL);
 
-    fprintf(stderr, "[mod_test_rwrite] going to echo %ld bytes\n",
+    fprintf(stderr, "[mod_test_rwrite] going to echo %" APR_SIZE_T_FMT " bytes\n",
             remaining);
 
     buff = malloc(buff_size);
@@ -53,7 +53,8 @@
     }
     
     fprintf(stderr,
-            "[mod_test_rwrite] done writing %ld of %ld bytes\n",
+            "[mod_test_rwrite] done writing %" APR_SIZE_T_FMT 
+            " of %" APR_SIZE_T_FMT " bytes\n",
             total, remaining);
 
     free(buff);    



Mime
View raw message