Changeset 657747 in git

Timestamp:

Jan 7, 2011, 4:00:59 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

afc913d3bf15e0e109b09ee2e7c9c088088429ce

Parents:

e961ee49ffe19b2ceb5ebbde55790cf01100a939

Message:

fprintf fixes

git-svn-id: file:///usr/local/Singular/svn/trunk@13785 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

omalloc

Files:

• omBin.c (modified) (1 diff)
• omDebugCheck.c (modified) (3 diffs)
• omTables.c (modified) (3 diffs)

omalloc/omBin.c

@@ -671 +671 @@
                                 (omIsStickyBin(bin) ? "S" :
                                  (omIsTrackBin(bin) ? "T" : "*"))),
-            bin->sizeW, bin->max_blocks);
+            (long)bin->sizeW, bin->max_blocks);
   }
   omGetTotalBinStat(bin, pages, used_blocks, free_blocks);

omalloc/omDebugCheck.c

@@ -424 +424 @@
   if (! (x=omCheckPtr(addr, omError_MaxError, OM_FLR)))
   {
-    fprintf(fd, "%s addr:%p size:%ld", s, addr, omSizeOfAddr(addr));
+    fprintf(fd, "%s addr:%p size:%ld", s, addr, (long)omSizeOfAddr(addr));
 
   if (error == omError_WrongSize && (flags & OM_FSIZE))
-    fprintf(fd, " specified size:%ld", (size_t) bin_size);
+    fprintf(fd, " specified size:%ld", (long) bin_size);
 
   if (error == omError_WrongBin && (flags & OM_FBIN))
-    fprintf(fd, " specified bin is of size:%ld", ((omBin) bin_size)->sizeW << LOG_SIZEOF_LONG);
+    fprintf(fd, " specified bin is of size:%ld",
+                 (long)((omBin) bin_size)->sizeW << LOG_SIZEOF_LONG);
 
   if (omIsTrackAddr(addr))
@@ -563 +564 @@
   omIterateTroughAddrs(1, 1, _omPrintUsedAddr, NULL);
   fprintf(fd, "UsedAddrs Summary: UsedBlocks:%ld  TotalSize:%ld\n",
-          om_total_used_blocks, om_total_used_size);
+          om_total_used_blocks, (long)om_total_used_size);
 }
 
@@ -574 +575 @@
   omIterateTroughAddrs(0, 1 ,  _omPrintUsedAddr, NULL);
   fprintf(fd, "UsedTrackAddrs Summary: UsedBlocks:%ld  TotalSize:%ld\n",
-          om_total_used_blocks, om_total_used_size);
+          om_total_used_blocks, (long)om_total_used_size);
 }
 #endif /* ! OM_NDEBUG */

omalloc/omTables.c

@@ -68 +68 @@
   long i, j;
   printf("omBin om_Size2%sBin[/*%ld*/] = {\n",
-         (track? "Track" : ""), max_block_size / SIZEOF_OM_ALIGNMENT);
+         (track? "Track" : ""), (long)(max_block_size / SIZEOF_OM_ALIGNMENT));
   i=0;
   j=SIZEOF_OM_ALIGNMENT;
@@ -89 +89 @@
   }
   printf("omBin om_Size2%sBin[/*%ld*/] = {\n",
-         (track ? "Track" : "Aligned"), max_block_size / SIZEOF_OM_ALIGNMENT);
+         (track ? "Track" : "Aligned"), (long)(max_block_size / SIZEOF_OM_ALIGNMENT));
   i=0;
   while (binSize[i] % SIZEOF_STRICT_ALIGNMENT != 0) i++;
@@ -114 +114 @@
   {
     printf("{om_ZeroPage, NULL, NULL, %ld, %ld, 0},\n",
-           binSize[i] / SIZEOF_LONG,
-           SIZEOF_OM_BIN_PAGE/binSize[i]);
+           (long)(binSize[i] / SIZEOF_LONG),
+           (long)(SIZEOF_OM_BIN_PAGE/binSize[i]));
   }
   printf("{om_ZeroPage, NULL, NULL, %ld, %ld, 0}\n};\n\n",
-         binSize[i] / SIZEOF_LONG,
-         SIZEOF_OM_BIN_PAGE/binSize[i]);
+         (long)(binSize[i] / SIZEOF_LONG),
+         (long)(SIZEOF_OM_BIN_PAGE/binSize[i]));
 }