Changeset 15338 for trunk/Compiler/runtime/printimpl.c

Timestamp:

2013-02-26T16:43:56+01:00 (11 years ago)

Author:

hkiel

Message:

• add some "static" keywords
• stop file compare when first difference occured
• use cached WinLibPath

File:

• trunk/Compiler/runtime/printimpl.c (modified) (8 diffs)

trunk/Compiler/runtime/printimpl.c

@@ -36 +36 @@
 #include "systemimpl.h"
 
-/* adrpo: this is defined in errorext. (enabled with omc +showErrorMessages) */
-extern int showErrorMessages;
+/* adrpo: "int showErrorMessages" is defined in errorext. (enabled with omc +showErrorMessages) */
 
 #define GROWTH_FACTOR 1.4  /* According to some rumors of buffer growth */
@@ -50 +49 @@
 #define errorCursize Print_var_errorCursize
 
-char *buf = NULL;
-char *errorBuf = NULL;
-
-int nfilled=0;
-int cursize=0;
-
-int errorNfilled=0;
-int errorCursize=0;
-
- char** savedBuffers=0;
- long* savedCurSize;
- long* savedNfilled;
+static char *buf = NULL;
+static char *errorBuf = NULL;
+
+static int nfilled=0;
+static int cursize=0;
+
+static int errorNfilled=0;
+static int errorCursize=0;
+
+static char** savedBuffers=0;
+static long* savedCurSize;
+static long* savedNfilled;
 
 static int increase_buffer(void)
@@ -136 +135 @@
 }
 
-int print_error_buf_impl(const char *str)
+static int print_error_buf_impl(const char *str)
 {
   /*  printf("cursize: %d, nfilled %d, strlen: %d\n",cursize,nfilled,strlen(str));*/
@@ -242 +241 @@
 
 /* returns NULL on failure */
-const char* PrintImpl__getString(void)
+static const char* PrintImpl__getString(void)
 {
   if(buf == NULL || buf[0]=='\0' || cursize==0){
@@ -360 +359 @@
     savedCurSize[handle] = 0;
     savedNfilled[handle] = 0;
-    if (buf == 0) { 
+    if (buf == 0) {
       fprintf(stderr,"Internal error, handle %d does not contain a valid buffer pointer\n",handle);
       return 1;
@@ -372 +371 @@
   long freeHandle,foundHandle=0;
 
-  if (! savedBuffers) { 
+  if (! savedBuffers) {
     savedBuffers = (char**)malloc(MAXSAVEDBUFFERS*sizeof(char*));
-    if (!savedBuffers) { 
+    if (!savedBuffers) {
       fprintf(stderr, "Internal error allocating savedBuffers in Print.saveAndClearBuf\n");
       return -1;
@@ -380 +379 @@
     memset(savedBuffers,0,MAXSAVEDBUFFERS);
   }
-  if (! savedCurSize) { 
+  if (! savedCurSize) {
     savedCurSize = (long*)malloc(MAXSAVEDBUFFERS*sizeof(long*));
-    if (!savedCurSize) { 
+    if (!savedCurSize) {
       fprintf(stderr, "Internal error allocating savedCurSize in Print.saveAndClearBuf\n");
       return -1;
@@ -388 +387 @@
     memset(savedCurSize,0,MAXSAVEDBUFFERS);
   }
-  if (! savedNfilled) { 
+  if (! savedNfilled) {
     savedNfilled = (long*)malloc(MAXSAVEDBUFFERS*sizeof(long*));
-    if (!savedNfilled) { 
+    if (!savedNfilled) {
       fprintf(stderr, "Internal error allocating savedNfilled in Print.saveAndClearBuf\n");
       return -1;