You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by bj...@apache.org on 2010/04/04 14:45:00 UTC

svn commit: r930676 - in /apr/apr/trunk/file_io: os2/printf.c os2/readwrite.c unix/printf.c unix/readwrite.c

Author: bjh
Date: Sun Apr  4 12:45:00 2010
New Revision: 930676

URL: http://svn.apache.org/viewvc?rev=930676&view=rev
Log:
OS/2: Share the unix implementation of apr_file_printf() which passes the
>HUGE_STRING_LEN test in testfile.

Added:
    apr/apr/trunk/file_io/os2/printf.c   (with props)
    apr/apr/trunk/file_io/unix/printf.c   (with props)
Modified:
    apr/apr/trunk/file_io/os2/readwrite.c
    apr/apr/trunk/file_io/unix/readwrite.c

Added: apr/apr/trunk/file_io/os2/printf.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/os2/printf.c?rev=930676&view=auto
==============================================================================
--- apr/apr/trunk/file_io/os2/printf.c (added)
+++ apr/apr/trunk/file_io/os2/printf.c Sun Apr  4 12:45:00 2010
@@ -0,0 +1 @@
+#include "../unix/printf.c"

Propchange: apr/apr/trunk/file_io/os2/printf.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: apr/apr/trunk/file_io/os2/readwrite.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/os2/readwrite.c?rev=930676&r1=930675&r2=930676&view=diff
==============================================================================
--- apr/apr/trunk/file_io/os2/readwrite.c (original)
+++ apr/apr/trunk/file_io/os2/readwrite.c Sun Apr  4 12:45:00 2010
@@ -372,28 +372,6 @@ APR_DECLARE(apr_status_t) apr_file_gets(
 
 
 
-APR_DECLARE_NONSTD(int) apr_file_printf(apr_file_t *fptr, 
-                                        const char *format, ...)
-{
-    int cc;
-    va_list ap;
-    char *buf;
-    int len;
-
-    buf = malloc(HUGE_STRING_LEN);
-    if (buf == NULL) {
-        return 0;
-    }
-    va_start(ap, format);
-    len = apr_vsnprintf(buf, HUGE_STRING_LEN, format, ap);
-    cc = apr_file_puts(buf, fptr);
-    va_end(ap);
-    free(buf);
-    return (cc == APR_SUCCESS) ? len : -1;
-}
-
-
-
 apr_status_t apr_file_check_read(apr_file_t *fd)
 {
     int rc;

Added: apr/apr/trunk/file_io/unix/printf.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/unix/printf.c?rev=930676&view=auto
==============================================================================
--- apr/apr/trunk/file_io/unix/printf.c (added)
+++ apr/apr/trunk/file_io/unix/printf.c Sun Apr  4 12:45:00 2010
@@ -0,0 +1,66 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr_file_io.h"
+#include "apr_strings.h"
+#include "apr_lib.h"
+
+struct apr_file_printf_data {
+    apr_vformatter_buff_t vbuff;
+    apr_file_t *fptr;
+    char *buf;
+};
+
+static int file_printf_flush(apr_vformatter_buff_t *buff)
+{
+    struct apr_file_printf_data *data = (struct apr_file_printf_data *)buff;
+
+    if (apr_file_write_full(data->fptr, data->buf, 
+                            data->vbuff.curpos - data->buf, NULL)) {
+        return -1;
+    }
+
+    data->vbuff.curpos = data->buf;
+    return 0;
+}
+
+APR_DECLARE_NONSTD(int) apr_file_printf(apr_file_t *fptr, 
+                                        const char *format, ...)
+{
+    struct apr_file_printf_data data;
+    va_list ap;
+    int count;
+
+    /* don't really need a HUGE_STRING_LEN anymore */
+    data.buf = malloc(HUGE_STRING_LEN);
+    if (data.buf == NULL) {
+        return -1;
+    }
+    data.vbuff.curpos = data.buf;
+    data.vbuff.endpos = data.buf + HUGE_STRING_LEN;
+    data.fptr = fptr;
+    va_start(ap, format);
+    count = apr_vformatter(file_printf_flush,
+                           (apr_vformatter_buff_t *)&data, format, ap);
+    /* apr_vformatter does not call flush for the last bits */
+    if (count >= 0) file_printf_flush((apr_vformatter_buff_t *)&data);
+
+    va_end(ap);
+
+    free(data.buf);
+
+    return count;
+}

Propchange: apr/apr/trunk/file_io/unix/printf.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: apr/apr/trunk/file_io/unix/readwrite.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/unix/readwrite.c?rev=930676&r1=930675&r2=930676&view=diff
==============================================================================
--- apr/apr/trunk/file_io/unix/readwrite.c (original)
+++ apr/apr/trunk/file_io/unix/readwrite.c Sun Apr  4 12:45:00 2010
@@ -562,50 +562,3 @@ APR_DECLARE(apr_status_t) apr_file_gets(
     }
     return rv;
 }
-
-struct apr_file_printf_data {
-    apr_vformatter_buff_t vbuff;
-    apr_file_t *fptr;
-    char *buf;
-};
-
-static int file_printf_flush(apr_vformatter_buff_t *buff)
-{
-    struct apr_file_printf_data *data = (struct apr_file_printf_data *)buff;
-
-    if (apr_file_write_full(data->fptr, data->buf, 
-                            data->vbuff.curpos - data->buf, NULL)) {
-        return -1;
-    }
-
-    data->vbuff.curpos = data->buf;
-    return 0;
-}
-
-APR_DECLARE_NONSTD(int) apr_file_printf(apr_file_t *fptr, 
-                                        const char *format, ...)
-{
-    struct apr_file_printf_data data;
-    va_list ap;
-    int count;
-
-    /* don't really need a HUGE_STRING_LEN anymore */
-    data.buf = malloc(HUGE_STRING_LEN);
-    if (data.buf == NULL) {
-        return -1;
-    }
-    data.vbuff.curpos = data.buf;
-    data.vbuff.endpos = data.buf + HUGE_STRING_LEN;
-    data.fptr = fptr;
-    va_start(ap, format);
-    count = apr_vformatter(file_printf_flush,
-                           (apr_vformatter_buff_t *)&data, format, ap);
-    /* apr_vformatter does not call flush for the last bits */
-    if (count >= 0) file_printf_flush((apr_vformatter_buff_t *)&data);
-
-    va_end(ap);
-
-    free(data.buf);
-
-    return count;
-}