From ea8b3b174ef206bc2b6999f9945822778b71ff5d Mon Sep 17 00:00:00 2001 From: malaterre Date: Wed, 8 Jun 2005 17:22:37 +0000 Subject: [PATCH] COMP: Fixing some warnings --- src/gdcmjpegls/Decoder/bitio.c | 1 + src/gdcmjpegls/Decoder/global.c | 36 ++++++++++++++++----------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/gdcmjpegls/Decoder/bitio.c b/src/gdcmjpegls/Decoder/bitio.c index 13d9f459..7ced3d2c 100644 --- a/src/gdcmjpegls/Decoder/bitio.c +++ b/src/gdcmjpegls/Decoder/bitio.c @@ -51,6 +51,7 @@ #include "global.h" #include "bitio.h" +#include // for memset extern int zeroLUT[]; /* lookup table to find number of leading zeroes */ diff --git a/src/gdcmjpegls/Decoder/global.c b/src/gdcmjpegls/Decoder/global.c index 533e0659..23105739 100644 --- a/src/gdcmjpegls/Decoder/global.c +++ b/src/gdcmjpegls/Decoder/global.c @@ -332,29 +332,29 @@ char *ttyfilename = "CON"; void fprint_disclaimer(FILE *fp, int nopause) { - char *p0, *p1; - FILE *ttyf; - int i, c; + char *p0, *p1; + FILE *ttyf; + int i; /*, c;*/ - nopause = nopause | !isatty(fileno(fp)); + nopause = nopause | !isatty(fileno(fp)); - if ( !nopause && (ttyf=fopen(ttyfilename,"r"))==NULL ) { - nopause = 1; - } + if ( !nopause && (ttyf=fopen(ttyfilename,"r"))==NULL ) { + nopause = 1; + } - for ( i=1, p0=disclaimer; ; i++ ) { - if ( !(*p0) ) break; - if ( !nopause && i%PAUSE==0 ) { + for ( i=1, p0=disclaimer; ; i++ ) { + if ( !(*p0) ) break; + if ( !nopause && i%PAUSE==0 ) { fflush(fp); fprintf(stderr, "--- (press RETURN to continue) ---"); fflush(stderr); - c = getc(ttyf); - } - for ( p1=p0; (*p1 != '\n') && (*p1 != 0); p1++ ); - *p1 = 0; - fprintf(fp,"%s\n",p0); - p0 = p1+1; +/* c = getc(ttyf);*/ } - fprintf(fp,"\n"); fflush(fp); - if ( !nopause) fclose(ttyf); + for ( p1=p0; (*p1 != '\n') && (*p1 != 0); p1++ ); + *p1 = 0; + fprintf(fp,"%s\n",p0); + p0 = p1+1; + } + fprintf(fp,"\n"); fflush(fp); + if ( !nopause) fclose(ttyf); } -- 2.48.1