Changeset 405

Timestamp:

Jul 29, 2006, 10:01:37 PM (19 years ago)

Author:

root

Message:

Use xfgets, xfgets_bstripcr

Location:

trunk/dll

Files:

• assoc.c (modified) (3 diffs)
• avl.c (modified) (3 diffs)

trunk/dll/assoc.c

@@ -9 +9 @@
   01 Aug 04 SHL Rework lstrip/rstrip usage
   14 Jul 06 SHL Use Runtime_Error
+  29 Jul 06 SHL Use xfgets, xfgets_bstripcr
 
 ***********************************************************************/
@@ -138 +139 @@
   if (fp) {
     while(!feof(fp)) {
-      if(!fgets(mask,CCHMAXPATH + 24,fp))
+      if (!xfgets(mask,sizeof(mask),fp,pszSrcFile,__LINE__))    // fixme why +24?
         break;
       mask[CCHMAXPATH] = 0;
@@ -144 +145 @@
       if(!*mask || *mask == ';')
         continue;
-      if(!fgets(cl,1024,fp) ||
-         !fgets(sig,CCHMAXPATH + 24,fp) ||
-         !fgets(offset,72,fp) ||
-         !fgets(flags,72,fp))
+      if(!xfgets(cl,sizeof(cl),fp,pszSrcFile,__LINE__) ||
+         !xfgets(sig,CCHMAXPATH + 24,fp,pszSrcFile,__LINE__) ||
+         !xfgets(offset,sizeof(offset),fp,pszSrcFile,__LINE__) ||
+         !xfgets(flags,sizeof(flags),fp,pszSrcFile,__LINE__))
         break;                       /* error! */
       cl[1000] = 0;
+      bstripcr(cl);
       sig[CCHMAXPATH] = 0;
+      bstripcr(sig);
       offset[34] = 0;
+      bstripcr(offset);
       flags[34] = 0;
-      bstripcr(cl);
-      bstripcr(sig);
-      bstripcr(offset);
       bstripcr(flags);
-      if(!*cl)
+      if (!*cl)
         continue;
       info = xmallocz(sizeof(LINKASSOC),pszSrcFile,__LINE__);

trunk/dll/avl.c

@@ -22 +22 @@
   26 Jun 06 SHL load_archivers: remember where comments are
   14 Jul 06 SHL Use Runtime_Error
+  29 Jul 06 SHL Use xfgets, xfgets_bstripcr
 
 ***********************************************************************/
@@ -286 +287 @@
 static PSZ get_line_strip_comments(PSZ pszIn, FILE *fp)
 {
-  PSZ psz = fgets(pszIn, ARCHIVER_LINE_BYTES, fp);
+  PSZ psz = xfgets(pszIn, ARCHIVER_LINE_BYTES, fp, pszSrcFile, __LINE__);
   PSZ psz2;
 
@@ -304 +305 @@
 static PSZ get_line_strip_white(PSZ pszIn, FILE *fp)
 {
-  PSZ psz = fgets(pszIn, ARCHIVER_LINE_BYTES, fp);
-
-  if (psz) {
+  PSZ psz = xfgets_bstripcr(pszIn, ARCHIVER_LINE_BYTES, fp, pszSrcFile, __LINE__);
+
+  if (psz)
     cur_line_num++;
-    bstripcr(pszIn);                    // Strip lead white and trailing white and CR/LF
-  }
 
   return psz;