Changeset 17782 for gsdl/trunk/common-src

Timestamp:

2008-11-07T13:38:22+13:00 (15 years ago)

Author:

ak19

Message:

(Minor changes, defensive programming.) Dr Bainbridge corrected all newlines chars printed out to stderr and stdout to endl as this may produce more consistent results across operating systems.

Location:

gsdl/trunk/common-src/src/gdbmedit

Files:

• db2txt/db2txt.cpp (modified) (3 diffs)
• gdbmget/gdbmget.cpp (modified) (2 diffs)
• gdbmset/gdbmset.cpp (modified) (5 diffs)

gsdl/trunk/common-src/src/gdbmedit/db2txt/db2txt.cpp

@@ -55 +55 @@
 
 void print_usage (char *program_name) {
-  cerr << "usage: " << program_name << " database-name\n\n";
+  cerr << "usage: " << program_name << " database-name" << endl << endl;
 }
 
@@ -77 +77 @@
 #endif
   if (dbf == NULL) {
-    cerr << "couldn't open " << argv[1] << "\n";
+    cerr << "couldn't open " << argv[1] << endl;
     exit (0);
   }
@@ -86 +86 @@
     for (i = 0; i < key.dsize; ++i)
       cout << key.dptr[i];
-    cout << "]\n";
+    cout << "]" << endl;
     value = gdbm_fetch (dbf, key);
     for (i = 0; i < value.dsize; ++i)
       cout << value.dptr[i];
-    cout << "\n----------------------------------------------------------------------\n";
+    cout << endl << "----------------------------------------------------------------------" << endl;
     free(value.dptr);
 

gsdl/trunk/common-src/src/gdbmedit/gdbmget/gdbmget.cpp

@@ -83 +83 @@
   if (dbf == NULL) 
     {
-      cerr << "couldn't create " << argv[1] << "\n";
+      cerr << "couldn't create " << argv[1] << endl;
       exit (-1);
     }
@@ -96 +96 @@
           cout << value.dptr[i];
         }
-      printf("\n");
+      cout << endl; // used to be printf("\n");
       // ?? free(value.dptri);
     } 
   else 
     {
-      printf("\n");
+      cout << endl; // used to be printf("\n");
     }
   

gsdl/trunk/common-src/src/gdbmedit/gdbmset/gdbmset.cpp

@@ -85 +85 @@
   if (dbf == NULL) 
     {
-      cerr << "couldn't open database connection to " << argv[1] << "\n";
+      cerr << "couldn't open database connection to " << argv[1] << endl;
       exit (-1);
     }
@@ -97 +97 @@
       datum orig_content,concat_content;
 
-      //cerr << "Appending [" << argv[2] << "] to '" << argv[3] << "' (length " << strlen(argv[3]) << ")\n";
+      //cerr << "Appending [" << argv[2] << "] to '" << argv[3] << "' (length " << strlen(argv[3]) << ")" << endl;
       // get old value, then top up
 
@@ -117 +117 @@
       if(gdbm_store(dbf, key, concat_content, GDBM_REPLACE) != 0)
         {
-          cerr << "failed to set [" << argv[2] << "] to '" << concat_data << "'\n";
+          cerr << "failed to set [" << argv[2] << "] to '" << concat_data << "'" << endl;
         }
       delete [] concat_data;
@@ -130 +130 @@
       datum content;
 
-      //cerr << "Setting [" << argv[2] << "] to '" << argv[3] << "' (length " << strlen(argv[3]) << ")\n";
+      //cerr << "Setting [" << argv[2] << "] to '" << argv[3] << "' (length " << strlen(argv[3]) << ")" << endl;
       content.dsize = strlen(argv[3]);
       content.dptr = argv[3];
       if(gdbm_store(dbf, key, content, GDBM_REPLACE) != 0)
         {
-          cerr << "failed to set [" << argv[2] << "] to '" << argv[3] << "'\n";
+          cerr << "failed to set [" << argv[2] << "] to '" << argv[3] << "'" << endl;
         }
     }
@@ -142 +142 @@
       if(gdbm_delete(dbf, key) != 0)
         {
-          cerr << "failed to remove [" << argv[2] << "]\n";
+          cerr << "failed to remove [" << argv[2] << "]" << endl;
         }
     }