Changeset adcd737 in git

Timestamp:

May 22, 2017, 12:14:09 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

fa22321438713e0e4dad2e822fab3a76f8cd140f

Parents:

aa8a7e160995098738e53c8327b17ceaa9adf723

Message:

omalloc: fprintf -> fputs, fputc

Location:

omalloc

Files:

• omBin.c (modified) (3 diffs)
• omDebugTrack.c (modified) (1 diff)
• omError.c (modified) (2 diffs)
• omStats.c (modified) (2 diffs)
• omalloc.c (modified) (2 diffs)

omalloc/omBin.c

@@ -663 +663 @@
   if (track)
   {
-    fprintf(fd, "T \t \t");
+    fputs("T \t \t",fd);
   }
   else
@@ -698 +698 @@
   omBin sticky;
 
-  fprintf(fd, " SizeW\tBlocks\tUPages\tFBlocks\tUBlocks\tSticky\n");
+  fputs(" SizeW\tBlocks\tUPages\tFBlocks\tUBlocks\tSticky\n",fd);
   fflush(fd);
   while (s_bin != NULL || i >= 0)
@@ -748 +748 @@
     free_blocks += free_blocks_p;
   }
-  fprintf(fd, "----------------------------------------\n");
+  fputs("----------------------------------------\n",fd);
   fprintf(fd, "      \t      \t%ld\t%ld\t%ld\n", pages, free_blocks, used_blocks);
 }

omalloc/omDebugTrack.c

@@ -602 +602 @@
   omAssume(d_addr->track > 0);
   if (max_frames <= 0) return;
-  if (! (d_addr->flags & OM_FUSED)) return;
+  if (! (d_addr->flags & OM_FUSED))
+  {
+    fputs(" freed\n",fd);
+    return;
+  }
 
   if (max_frames > OM_MAX_KEPT_FRAMES) max_frames = OM_MAX_KEPT_FRAMES;
 
-  fprintf(fd, " allocated at ");
+  fputs(" allocated at ",fd);
   if (! _omPrintBackTrace((void **)OM_ALLOC_FRAMES(d_addr),
                           (d_addr->track > 1 ? max_frames : 0),
                           fd,
                           OM_FLR_ARG(d_addr->alloc_file, d_addr->alloc_line, d_addr->alloc_r)))
-    fprintf(fd," ??");
+    fputs(" ??",fd);
   if (d_addr->track > 1)
   {
     if (d_addr->track > 3 && ! (d_addr->flags & OM_FUSED))
     {
-      fprintf(fd, "\n freed at ");
+      fputs("\n freed at ",fd);
       if (! _omPrintBackTrace(OM_FREE_FRAMES(d_addr),
                           (d_addr->track > 4 ? max_frames : 0),
                           fd,
                           OM_FLR_ARG(d_addr->free_file, d_addr->free_line, d_addr->free_r)))
-        fprintf(fd," ??");
-    }
-  }
-  fprintf(fd, "\n");
+        fputs(" ??",fd);
+    }
+  }
+  fputc('\n',fd);
   fflush(fd);
 }

omalloc/omError.c

@@ -107 +107 @@
       va_list ap;
       va_start(ap, fmt);
-      fprintf(stderr, ": ");
+      fputs( ": ",stderr);
       vfprintf(stderr, fmt, ap);
       va_end(ap);
@@ -115 +115 @@
     {
 #ifndef OM_NDEBUG
-      fprintf(stderr, "\n occurred at: ");
+      fputs("\n occurred at: ",stderr);
       if (! _omPrintCurrentBackTrace(stderr, OM_FLR_VAL))
-        fprintf(stderr, " ??");
+        fputs(" ??",stderr);
 #endif
     }
-    fprintf(stderr, "\n");
+    fputc('\n',stderr);
     fflush(stderr);
   }

omalloc/omStats.c

@@ -130 +130 @@
 {
   omUpdateInfo();
-  fprintf(fd, "                  Current:       Max:\n");
+  fputs("                  Current:       Max:\n",fd);
   fprintf(fd, "BytesSystem:     %8ldk  %8ldk\n", om_Info.CurrentBytesSystem/1024, om_Info.MaxBytesSystem/1024);
   fprintf(fd, "BytesSbrk:       %8ldk  %8ldk\n", om_Info.CurrentBytesSbrk/1024, om_Info.MaxBytesSbrk/1024);
@@ -138 +138 @@
   fprintf(fd, "PagesAlloc:      %8ld   %8ld \n", om_Info.UsedPages, om_Info.MaxPages);
   fprintf(fd, "RegionsAlloc:    %8ld   %8ld \n", om_Info.CurrentRegionsAlloc, om_Info.MaxRegionsAlloc);
-  fprintf(fd, "                     Used:     Avail:\n");
+  fputs("                     Used:     Avail:\n",fd);
   fprintf(fd, "BytesAppl:       %8ldk  %8ldk\n", om_Info.UsedBytes/1024, om_Info.AvailBytes/1024);
   fprintf(fd, "BytesMalloc:     %8ldk  %8ldk\n", om_Info.UsedBytesMalloc/1024, om_Info.AvailBytesMalloc/1024);

omalloc/omalloc.c

@@ -42 +42 @@
 void* valloc(size_t size)
 {
-  fprintf(stderr, "omalloc Warning: valloc not yet implemented\n");
+  fputs("omalloc Warning: valloc not yet implemented\n",stderr);
   fflush(NULL);
   return NULL;
@@ -49 +49 @@
 void* memalign(size_t size_1, size_t size_2)
 {
-  fprintf(stderr, "omalloc Warning: memalign not yet implemented\n");
+  fputs("omalloc Warning: memalign not yet implemented\n",stderr);
   fflush(NULL);
   return NULL;