Changeset 1074 for pjproject/trunk

Timestamp:

Mar 16, 2007 9:25:47 AM (18 years ago)

Author:

bennylp

Message:

Implemented ticket #185: Added pj_file_flush() to file I/O API to flush file buffers

Location:

pjproject/trunk

Files:

• pjlib/include/pj/file_io.h (modified) (1 diff)
• pjlib/src/pj/config.c (modified) (1 diff)
• pjlib/src/pj/file_io_ansi.c (modified) (1 diff)
• pjlib/src/pj/file_io_win32.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)

pjproject/trunk/pjlib/include/pj/file_io.h

@@ -164 +164 @@
                                     pj_off_t *pos);
 
+/**
+ * Flush file buffers.
+ *
+ * @param fd            The file descriptor.
+ *
+ * @return              PJ_SUCCESS or the appropriate error code on error.
+ */
+PJ_DECL(pj_status_t) pj_file_flush(pj_oshandle_t fd);
+
+
 /** @} */
 

pjproject/trunk/pjlib/src/pj/config.c

@@ -22 +22 @@
 
 static const char *id = "config.c";
-const char *PJ_VERSION = "0.5.10.1-trunk";
+const char *PJ_VERSION = "0.5.10.2-trunk";
 
 PJ_DEF(void) pj_dump_config(void)

pjproject/trunk/pjlib/src/pj/file_io_ansi.c

@@ -155 +155 @@
 }
 
+PJ_DEF(pj_status_t) pj_file_flush(pj_oshandle_t fd)
+{
+    int rc;
 
+    rc = fflush((FILE*)fd);
+    if (rc == EOF) {
+        return PJ_RETURN_OS_ERROR(errno);
+    }
+
+    return PJ_SUCCESS;
+}

pjproject/trunk/pjlib/src/pj/file_io_win32.c

@@ -205 +205 @@
 }
 
+PJ_DEF(pj_status_t) pj_file_flush(pj_oshandle_t fd)
+{
+    BOOL rc;
+
+    rc = FlushFileBuffers(fd);
+
+    if (!rc) {
+        DWORD dwStatus = GetLastError();
+        if (dwStatus != 0)
+            return PJ_RETURN_OS_ERROR(dwStatus);
+    }
+
+    return PJ_SUCCESS;
+}

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -291 +291 @@
         pj_ssize_t size = len;
         pj_file_write(pjsua_var.log_file, buffer, &size);
+        pj_file_flush(pjsua_var.log_file);
     }