use #include <inttypes.h> to platform independent print 'size_t' variables

This commit is contained in:
rlar 2011-07-23 18:40:20 +00:00
parent ffe7405ad2
commit 2c60f3892c
3 changed files with 15 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2011-07-23 Robert Larice <>
* src/ciderlib/oned/oneprint.c ,
* src/ciderlib/twod/twoprint.c :
use #include <inttypes.h> to platform independent print 'size_t' variables
2011-07-23 Robert Larice
* autogen.sh :
update for --adms3

View File

@ -16,6 +16,9 @@ $Id$
#include "onedext.h"
#include "oneddefs.h"
#include <inttypes.h>
void
ONEprnSolution(FILE *file, ONEdevice *pDevice, OUTPcard *output)
{
@ -326,7 +329,7 @@ struct MatrixElement {
void
ONEmemStats(FILE *file, ONEdevice *pDevice)
{
static const char memFormat[] = "%-20s%10d%10d\n";
const char memFormat[] = "%-20s" "%10d" "%10" PRIuPTR "\n";
/* static const char sumFormat[] = "%20s %-10d\n";*/
int size;
size_t memory;
@ -368,7 +371,7 @@ ONEmemStats(FILE *file, ONEdevice *pDevice)
size = numContactNodes;
memory += (size_t) size * sizeof(ONEnode *);
size = 0;
fprintf(file, "%-20s%10s%10d\n", "Misc Mesh", "n/a", memory);
fprintf(file, "%-20s%10s%10" PRIuPTR "\n", "Misc Mesh", "n/a", memory);
size = pDevice->numOrigEquil;
memory = (size_t) size * sizeof(struct MatrixElement);

View File

@ -17,6 +17,9 @@ $Id$
#include "twoddefs.h"
#include "twodext.h"
#include <inttypes.h>
void
TWOprnSolution(FILE *file, TWOdevice *pDevice, OUTPcard *output)
{
@ -344,7 +347,7 @@ struct MatrixElement
void
TWOmemStats(FILE *file, TWOdevice *pDevice)
{
static const char memFormat[] = "%-20s%10d%10d\n";
const char memFormat[] = "%-20s" "%10d" "%10" PRIuPTR "\n";
/* static const char sumFormat[] = "%20s %-10d\n"; */
int size;
size_t memory;
@ -395,7 +398,7 @@ TWOmemStats(FILE *file, TWOdevice *pDevice)
for (pChannel = pDevice->pChannel; pChannel; pChannel = pChannel->next)
size++;
memory += (size_t) size * sizeof(TWOchannel);
fprintf(file, "%-20s%10s%10d\n", "Misc Mesh", "n/a", memory);
fprintf(file, "%-20s%10s%10" PRIuPTR "\n", "Misc Mesh", "n/a", memory);
size = pDevice->numOrigEquil;
memory = (size_t) size * sizeof(struct MatrixElement);