Changeset 195 for libmpc/branches/r2d/mpcenc/stderr.c

Timestamp:

12/29/06 15:21:35 (17 years ago)

Author:

r2d

Message:

• moved libmpcdec includes in /mpc
• removed mppdec.h and mpp.h
• mpcenc defines cleanup

File:

• libmpc/branches/r2d/mpcenc/stderr.c (modified) (7 diffs)

libmpc/branches/r2d/mpcenc/stderr.c

@@ -2 +2 @@
  *  stderr - Message output system
  *
- *  (C) Frank Klemm, Janne Hyvärinen 2002. All rights reserved.
+ *  (C) Frank Klemm, Janne Hyvï¿œinen 2002. All rights reserved.
  *
  *  Principles:
@@ -20 +20 @@
  */
 
-#include "mppdec.h"
+#include <mpc/mpc_types.h>
+
 #ifdef _WIN32
 # include <windows.h>
 #endif
 
+#include <stdio.h>
+#include <stdarg.h>
+// #include "mpcenc.h"
 
-static Bool_t  stderr_silent = 0;
+#define WRITE(fp,ptr,len)      fwrite (ptr, 1, len, fp)     // WRITE   returns -1 or 0 on error/EOF, otherwise > 0
+
+static mpc_bool_t  stderr_silent = 0;
 
 
 void
-SetStderrSilent ( Bool_t state )
+SetStderrSilent ( mpc_bool_t state )
 {
     stderr_silent = state;
@@ -36 +42 @@
 
 
-Bool_t
+mpc_bool_t
 GetStderrSilent ( void )
 {
@@ -43 +49 @@
 
 
-int Cdecl
+int mpc_cdecl
 stderr_printf ( const char* format, ... )
 {
-    char     buff [2 * PATHLEN_MAX + 3072];
+    char     buff [2 * 1024 + 3072];
     char*    p = buff;
     char*    q;
@@ -61 +67 @@
 #if   defined __unix__  ||  defined __UNIX__
 
-        WRITE ( STDERR, buff, ret );
+        WRITE ( stderr, buff, ret );
 
 #elif defined _WIN32
@@ -89 +95 @@
         if ( hSTDERR == INVALID_HANDLE_VALUE ) {
             while ( ( q = strchr (p, '\n')) != NULL ) {
-                WRITE ( STDERR, p, q-p );
-                WRITE ( STDERR, "\r\n", 2 );
+                WRITE ( stderr, p, q-p );
+                WRITE ( stderr, "\r\n", 2 );
                 p = q+1;
             }
-            WRITE ( STDERR, p, strlen (p) );
+            WRITE ( stderr, p, strlen (p) );
         }
         else {
@@ -165 +171 @@
         // for non-Unix systems we must merge carriage returns into the stream to avoid staircases
         while ( ( q = strchr (p, '\n')) != NULL ) {
-            WRITE ( STDERR, p, q-p );
-            WRITE ( STDERR, "\r\n", 2 );
+            WRITE ( stderr, p, q-p );
+            WRITE ( stderr, "\r\n", 2 );
             p = q+1;
         }
-        WRITE ( STDERR, p, strlen (p) );
+        WRITE ( stderr, p, strlen (p) );
 
 #endif