Changeset 515271 for pcp/src/output.c

Timestamp:

Apr 21, 2008, 2:19:26 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

333e84

Parents:

9422fd

git-author:

Frederik Heber <heber@…> (04/21/08 14:04:30)

git-committer:

Frederik Heber <heber@…> (04/21/08 14:19:26)

Message:

OpenFile...(): check == 0 is now == NULL and else condition added in OpenFile()

File:

• pcp/src/output.c (modified) (8 diffs)

pcp/src/output.c

@@ -70 +70 @@
   sprintf(name, "%s%s%s", P->Files.default_path, P->Files.mainname, suffix);
   *file = fopen(name, what);
-  if (*file == 0) {
+  if (*file == NULL) {
     fprintf(stderr,"(%i) Normal access failed: name %s, what %s\n", P->Par.me, name, what);
     /* hier default file ausprobieren, falls nur gelesen werden soll! */
@@ -78 +78 @@
       sprintf(name, "%s%s", P->Files.default_path,suffix);
       *file = fopen(name,what);
-      if (*file != 0) {
+      if (*file != NULL) {
         if (verbose) fprintf(stderr,"(%i) Default file is open: %s\n",P->Par.me,name);
         Free(name, "OpenFile: name");
         return(1);
-      }
-    }
-    fprintf(stderr,"\n(%i)Error: Cannot open neither normal nor default file: %s\n",P->Par.me,name);
-    Free(name, "OpenFile: name");
-    return(0);
+      } else {
+        fprintf(stderr,"\n(%i)Error: Cannot open neither normal nor default file for reading: %s\n",P->Par.me,name);
+        Free(name, "OpenFile: name");
+        return(0);
+      }
+    } else {
+      fprintf(stderr,"\n(%i)Error: Cannot open normal file for writing: %s\n",P->Par.me,name);
+      Free(name, "OpenFile: name");
+      return(0);
+    }
   } else {
     if(verbose) fprintf(stderr,"(%i) File is open: %s\n",P->Par.me,name);
-                Free(name, "OpenFile: name");
+    Free(name, "OpenFile: name");
     return(1);
   }
@@ -112 +117 @@
   sprintf(name, "%s%s%s.%02i", P->Files.default_path, P->Files.mainname, suffix, No);
   *file = fopen(name, what);
-  if (*file == 0) {
+  if (*file == NULL) {
     /* falls nur gelesen wird, auch default_path ausprobieren */
     if (*what == 'r') {
@@ -119 +124 @@
       sprintf(name, "%s%s.%02i", P->Files.default_path, suffix, No);
       *file = fopen(name, what);
-      if (*file != 0) {
+      if (*file != NULL) {
         if(verbose) fprintf(stderr,"(%i) Default file is open: %s\n", P->Par.me, name);
         Free(name, "OpenFileNo2: name");
@@ -154 +159 @@
   sprintf(name, "%s%s%s.%04i", P->Files.default_path, P->Files.mainname, suffix, No);
   *file = fopen(name, what);
-  if (*file == 0) {
+  if (*file == NULL) {
     /* falls nur gelesen wird, auch default_path ausprobieren */
     if (*what == 'r') {
@@ -161 +166 @@
       sprintf(name, "%s%s.%04i", P->Files.default_path, suffix, No);
       *file = fopen(name, what);
-      if (*file != 0) {
+      if (*file != NULL) {
         if(verbose) fprintf(stderr,"(%i) Default file is open: %s\n", P->Par.me, name);
         Free(name, "OpenFileNo: name");
@@ -198 +203 @@
   sprintf(name, "%s%s%s.%04i%s", P->Files.default_path, P->Files.mainname, suffix, No, postfix);
   *file = fopen(name, what);
-  if (*file == 0) {
+  if (*file == NULL) {
     fprintf(stderr,"\n(%i)Error: Cannot open file: %s\n", P->Par.me, name);
     Free(name, "OpenFileNoPost: name");
@@ -227 +232 @@
   sprintf(name,"%s%s%s.%04i.%04i", P->Files.default_path, P->Files.mainname, suffix, No1, No2);
   *file = fopen(name, what);
-  if(*file == 0) {
+  if(*file == NULL) {
     fprintf(stderr,"\n(%i)Error: Cannot open file: %s\n", P->Par.me, name);
     Free(name, "OpenFileNoNo: name");