o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jpegdump: fix build and warnings

Browse source 
R=rsc
https://codereview.appspot.com/7070070
This commit is contained in:
David du Colombier 2013-01-19 10:05:12 +01:00
parent 23efb34d47
commit d5baaf984f
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/cmd/jpg/jpegdump.c
View file

@ -5,6 +5,7 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include <ctype.h> #include <ctype.h>
#include <stdarg.h>
/* subroutines done by macros */ /* subroutines done by macros */
#define min(A,B) ((A)<(B) ? (A) : (B)) #define min(A,B) ((A)<(B) ? (A) : (B))
@ -90,7 +91,7 @@ int get2 (void) {
} }
void eatmarker (int kind) { void eatmarker (int kind) {
int l, c; int l;
l = get2(); l = get2();
printf ("%02x len=%d\n", kind, l); printf ("%02x len=%d\n", kind, l);
for (l -= 2; l > 0; l--) for (l -= 2; l > 0; l--)
@ -198,7 +199,7 @@ int get1dqt (void) {
tab[i] = p ? get2() : get1(); tab[i] = p ? get2() : get1();
if (toption) { if (toption) {
for (i = 0; i < 64; i++) for (i = 0; i < 64; i++)
printf ("\t%q[%02d] = %d\n", i, tab[i]); printf ("\t%%q[%02d] = %d\n", i, tab[i]);
} }
return p ? 65 : 129; return p ? 65 : 129;
} }
@ -211,7 +212,7 @@ void get_dqt (int kind) {
} }
int get1dht (void) { int get1dht (void) {
int l, tcth, p, i, j, v[16], vv[16][256]; int l, tcth, i, j, v[16], vv[16][256];
tcth = get1(); tcth = get1();
printf ("DHT:\tclass = %d, table = %d\n", tcth >> 4, tcth & 0xf); printf ("DHT:\tclass = %d, table = %d\n", tcth >> 4, tcth & 0xf);
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
@ -224,10 +225,10 @@ int get1dht (void) {
} }
if (toption) { if (toption) {
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
printf ("\t%l[%02d] = %d\n", i+1, v[i]); printf ("\t%%l[%02d] = %d\n", i+1, v[i]);
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
for (j = 0; j < v[i]; j++) for (j = 0; j < v[i]; j++)
printf ("\t%v[%02d,%02d] = %d\n", i+1, j+1, vv[i][j]); printf ("\t%%v[%02d,%02d] = %d\n", i+1, j+1, vv[i][j]);
} }
return l; return l;
} }
@ -255,8 +256,8 @@ void get_sos (int kind) {
printf ("\tah = %d, al = %d\n", ahal >> 4, ahal &0xf); printf ("\tah = %d, al = %d\n", ahal >> 4, ahal &0xf);
} }
main (int argc, char *argv[]) { int main (int argc, char *argv[]) {
int l, stuff, i, j, c; int l, stuff, c;
while (argc > 1 && argv[1][0] == '-') { while (argc > 1 && argv[1][0] == '-') {
switch (argv[1][1]) { switch (argv[1][1]) {
case 't': case 't':