Changeset 2541

Timestamp:

2001-06-13T12:24:49+12:00 (23 years ago)

Author:

jrm21

Message:

1) replaced obsolete bzero() calls with memset() calls.
2) Makefile.in fixed for c++ variables (CXX instead of CPP), and GSDLOS is now

set from configure, so files are installed in the right place.

3) text.pass1.cpp now prints an error message if index file can't be created.

Location:

trunk/gsdl/src/mgpp/text

Files:

• Makefile.in (modified) (5 diffs)
• comp_dict.cpp (modified) (1 diff)
• text.pass1.cpp (modified) (4 diffs)
• text.pass2.cpp (modified) (4 diffs)

trunk/gsdl/src/mgpp/text/Makefile.in

@@ -36 +36 @@
 AR = ar
 CC = @CC@
-CPP = @CXX@
+CXX = @CXX@
 CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX
-CPPFLAGS = @CPPFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX
+CXXFLAGS = @CXXFLAGS@ -DSILENT -DSHORT_SUFFIX
 DEFS = @DEFS@
 RANLIB = @RANLIB@
@@ -56 +56 @@
 #
 ##########################################
-
+GSDLOS = @gsdlos@
 
 bindir = $(top_srcdir)/bin/$(GSDLOS)
@@ -64 +64 @@
 mandir = $(prefix)/man/man1
 
-COMPILE = $(CC) -c $(DEFS) $(TREC_MODE) $(READLINE) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-CPPCOMPILE = $(CPP) -c $(DEFS) $(TREC_MODE) $(READLINE) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+COMPILE = $(CC) -c $(DEFS) $(TREC_MODE) $(READLINE) $(INCLUDES) $(CFLAGS)
+CXXCOMPILE = $(CXX) -c $(DEFS) $(TREC_MODE) $(READLINE) $(INCLUDES) $(CXXFLAGS)
 LINK = $(CC) $(LDFLAGS) -o $@
 
@@ -75 +75 @@
 .SUFFIXES: .cpp .o
 .cpp.o:
-    $(CPPCOMPILE) -D__cplusplus $<
+    $(CXXCOMPILE) $<
 
 
@@ -158 +158 @@
 
 depend:
-    makedepend -Y -- $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -- $(SOURCES)
+    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) $(CFLAGS) -- $(SOURCES)
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

trunk/gsdl/src/mgpp/text/comp_dict.cpp

@@ -81 +81 @@
   words = ht->words;
 
-  bzero ((char *) ht->table, ht_size * sizeof (ht->table[0]));
+  memset (ht->table, '\0', ht_size * sizeof (ht->table[0]));
 
   if (!(allwords = (u_char *) Xmalloc (sizeof (u_char) * cfh->uncompressed_size)))

trunk/gsdl/src/mgpp/text/text.pass1.cpp

@@ -41 +41 @@
 #include "TextEl.h"
 
+/* for more meaningful messages - jrm21 (gsdl) */
+#ifdef HAVE_STRERROR
+#include <string.h>
+#include <errno.h>
+#endif
+
+
 #define POOL_SIZE 1024*1024
 #define INITIAL_HASH_SIZE 7927
@@ -111 +118 @@
     }
     ChangeMem (sizeof (hash_rec) * dd->HashSize);
-    bzero ((char *) (dd->HashTable), sizeof (hash_rec) * dd->HashSize);
+    memset (dd->HashTable,'\0' , sizeof (hash_rec) * dd->HashSize);
 
     word = Pool;
@@ -222 +229 @@
       }
       ChangeMem (sizeof (hash_rec) * size);
-      bzero ((char *) ht, sizeof (hash_rec) * size);
+      memset (ht, '\0', sizeof (hash_rec) * size);
 
       for (i = 0; i < dd->HashSize; i++)
@@ -349 +356 @@
   if (!(fp = create_file (file_name, TEXT_STATS_DICT_SUFFIX, "wb",
               MAGIC_STATS_DICT, MG_MESSAGE)))  /* [RPAP - Feb 97: WIN32 Port] */
-    return COMPERROR;
-  
+    {
+#ifdef HAVE_STRERROR
+      fprintf(stderr,"Couldn't create file %s:%s\n",
+              file_name,
+              strerror(errno)
+              );
+#endif
+      return COMPERROR;
+    }
+
   temp_str = msg_prefix;
   msg_prefix = "text.pass1";

trunk/gsdl/src/mgpp/text/text.pass2.cpp

@@ -118 +118 @@
   
   // write out the compressed text header
-  bzero ((char *) &cth, sizeof (cth));
+  memset (&cth, '\0', sizeof (cth));
   if (fwrite (&cth, sizeof (cth), 1, text) != 1)
     return COMPERROR;
@@ -139 +139 @@
     nht[i].HashSize = INITIAL_HASH_SIZE;
     nht[i].HashTable = (novel_hash_rec *) Xmalloc (sizeof (novel_hash_rec) * nht[i].HashSize);
-    bzero ((char *) nht[i].HashTable,
+    memset (nht[i].HashTable, '\0',
            sizeof (novel_hash_rec) * nht[i].HashSize);
     nht[i].HashUsed = 0;
@@ -329 +329 @@
               return (COMPERROR);
             }
-              bzero ((char *) ht, sizeof (novel_hash_rec) * size);
+              memset (ht, '\0', sizeof (novel_hash_rec) * size);
               
               for (i = 0; i < h->HashSize; i++)
@@ -467 +467 @@
       long lens[16], flens[16];
       char_pool *cp;
-      bzero ((char *) chars, sizeof (chars));
-      bzero ((char *) lens, sizeof (lens));
+      memset (chars, '\0', sizeof (chars));
+      memset (lens, '\0', sizeof (lens));
       for (cp = nht[i].first_pool; cp; cp = cp->next)
     {