Changeset 2956
- Timestamp:
- 2007-06-16 03:24:33 (2 years ago)
- Files:
-
- liboggz/trunk/include/oggz/oggz_off_t.h (modified) (1 diff)
- liboggz/trunk/include/oggz/oggz_off_t.h.in (modified) (1 diff)
- liboggz/trunk/include/oggz/oggz_off_t_win32.h (modified) (1 diff)
- liboggz/trunk/src/tests/io-read-single.c (modified) (1 diff)
- liboggz/trunk/src/tests/io-read.c (modified) (1 diff)
- liboggz/trunk/src/tests/io-seek.c (modified) (1 diff)
- liboggz/trunk/src/tests/io-write-flush.c (modified) (1 diff)
- liboggz/trunk/src/tests/io-write.c (modified) (1 diff)
- liboggz/trunk/src/tests/oggz_tests.h (modified) (1 diff)
- liboggz/trunk/src/tests/read-generated.c (modified) (1 diff)
- liboggz/trunk/src/tests/read-stop-err.c (modified) (1 diff)
- liboggz/trunk/src/tests/read-stop-ok.c (modified) (1 diff)
- liboggz/trunk/src/tests/seek-stress.c (modified) (2 diffs)
- liboggz/trunk/src/tools/oggz-scan.c (modified) (1 diff)
- liboggz/trunk/src/tools/oggz-validate.c (modified) (1 diff)
- liboggz/trunk/src/tools/oggzdump.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
liboggz/trunk/include/oggz/oggz_off_t.h
r2608 r2956 70 70 /* Note: This is an ugly fix for proper display in printf but will work for now */ 71 71 #if SIZEOF_OGGZ_OFF_T == 8 72 #define PRI_OGGZ_OFF_T ="q"72 #define PRI_OGGZ_OFF_T "q" 73 73 #else 74 #define PRI_OGGZ_OFF_T ="l"74 #define PRI_OGGZ_OFF_T "l" 75 75 #endif 76 76 liboggz/trunk/include/oggz/oggz_off_t.h.in
r2608 r2956 70 70 /* Note: This is an ugly fix for proper display in printf but will work for now */ 71 71 #if SIZEOF_OGGZ_OFF_T == 8 72 #define PRI_OGGZ_OFF_T ="q"72 #define PRI_OGGZ_OFF_T "q" 73 73 #else 74 #define PRI_OGGZ_OFF_T ="l"74 #define PRI_OGGZ_OFF_T "l" 75 75 #endif 76 76 liboggz/trunk/include/oggz/oggz_off_t_win32.h
r2608 r2956 68 68 /* Note: This is an ugly fix for proper display in printf but will work for now */ 69 69 #if SIZEOF_OGGZ_OFF_T == 8 70 #define PRI_OGGZ_OFF_T ="q"70 #define PRI_OGGZ_OFF_T "q" 71 71 #else 72 #define PRI_OGGZ_OFF_T ="l"72 #define PRI_OGGZ_OFF_T "l" 73 73 #endif 74 74 liboggz/trunk/src/tests/io-read-single.c
r526 r2956 87 87 88 88 #ifdef DEBUG 89 printf ("%08" PRI_ off_t"x: serialno %010ld, "89 printf ("%08" PRI_OGGZ_OFF_T "x: serialno %010ld, " 90 90 "granulepos %" PRId64 ", packetno %" PRId64, 91 91 oggz_tell (oggz), serialno, op->granulepos, op->packetno); liboggz/trunk/src/tests/io-read.c
r387 r2956 85 85 86 86 #ifdef DEBUG 87 printf ("%08" PRI_ off_t"x: serialno %010ld, "87 printf ("%08" PRI_OGGZ_OFF_T "x: serialno %010ld, " 88 88 "granulepos %" PRId64 ", packetno %" PRId64, 89 89 oggz_tell (oggz), serialno, op->granulepos, op->packetno); liboggz/trunk/src/tests/io-seek.c
r387 r2956 89 89 90 90 #ifdef DEBUG 91 printf ("%08" PRI_ off_t"x: serialno %010ld, "91 printf ("%08" PRI_OGGZ_OFF_T "x: serialno %010ld, " 92 92 "granulepos %" PRId64 ", packetno %" PRId64, 93 93 oggz_tell (oggz), serialno, op->granulepos, op->packetno); liboggz/trunk/src/tests/io-write-flush.c
r696 r2956 103 103 104 104 #ifdef DEBUG 105 printf ("%08" PRI_ off_t"x: serialno %010ld, "105 printf ("%08" PRI_OGGZ_OFF_T "x: serialno %010ld, " 106 106 "granulepos %" PRId64 ", packetno %" PRId64, 107 107 oggz_tell (oggz), serialno, op->granulepos, op->packetno); liboggz/trunk/src/tests/io-write.c
r671 r2956 85 85 86 86 #ifdef DEBUG 87 printf ("%08" PRI_ off_t"x: serialno %010ld, "87 printf ("%08" PRI_OGGZ_OFF_T "x: serialno %010ld, " 88 88 "granulepos %" PRId64 ", packetno %" PRId64, 89 89 oggz_tell (oggz), serialno, op->granulepos, op->packetno); liboggz/trunk/src/tests/oggz_tests.h
r382 r2956 42 42 #endif 43 43 44 /* FIXME: on Mac OS X, off_t is 64-bits. Obviously we want a nicer45 * way to do it than this, but a quick fix is a good fix */46 #ifdef __APPLE__47 # define PRI_off_t "q"48 #else49 # define PRI_off_t "l"50 #endif51 52 44 #define INFO(str) \ 53 45 { printf ("---- %s ...\n", (str)); } liboggz/trunk/src/tests/read-generated.c
r521 r2956 78 78 79 79 #ifdef DEBUG 80 printf ("%08" PRI_ off_t"x: serialno %010ld, "80 printf ("%08" PRI_OGGZ_OFF_T "x: serialno %010ld, " 81 81 "granulepos %" PRId64 ", packetno %" PRId64, 82 82 oggz_tell (oggz), serialno, op->granulepos, op->packetno); liboggz/trunk/src/tests/read-stop-err.c
r387 r2956 87 87 88 88 #ifdef DEBUG 89 printf ("%08" PRI_ off_t"x: serialno %010ld, "89 printf ("%08" PRI_OGGZ_OFF_T "x: serialno %010ld, " 90 90 "granulepos %" PRId64 ", packetno %" PRId64, 91 91 oggz_tell (oggz), serialno, op->granulepos, op->packetno); liboggz/trunk/src/tests/read-stop-ok.c
r2012 r2956 85 85 86 86 #ifdef DEBUG 87 printf ("%08" PRI_ off_t"x: serialno %010ld, "87 printf ("%08" PRI_OGGZ_OFF_T "x: serialno %010ld, " 88 88 "granulepos %" PRId64 ", packetno %" PRId64, 89 89 oggz_tell (oggz), serialno, op->granulepos, op->packetno); liboggz/trunk/src/tests/seek-stress.c
r873 r2956 71 71 72 72 if (verbose) 73 printf ("\t%0 8lx: %lld ms (%+lld ms)\n",73 printf ("\t%0" PRI_OGGZ_OFF_T "x: %lld ms (%+lld ms)\n", 74 74 oggz_tell (oggz), oggz_tell_units (oggz), diff); 75 75 … … 125 125 max_units = oggz_seek_units (oggz, 0, SEEK_END); 126 126 if (verbose) 127 printf ("\t%08lx: %lld ms\n", oggz_tell (oggz), oggz_tell_units (oggz)); 127 printf ("\t%0" PRI_OGGZ_OFF_T "x: %lld ms\n", 128 oggz_tell (oggz), oggz_tell_units (oggz)); 128 129 129 130 try_seek_units (oggz, max_units / 2); liboggz/trunk/src/tools/oggz-scan.c
r2955 r2956 119 119 } 120 120 121 /* FIXME: on Mac OS X, off_t is 64-bits. Obviously we want a nicer122 * way to do it than this, but a quick fix is a good fix */123 #ifdef __APPLE__124 # define PRI_off_t "q"125 #else126 # define PRI_off_t "l"127 #endif128 129 121 static int 130 122 read_packet (OGGZ * oggz, ogg_packet * op, long serialno, void * user_data) liboggz/trunk/src/tools/oggz-validate.c
r2339 r2956 285 285 ret = log_error (); 286 286 if (timestamp == -1.0) { 287 fprintf (stderr, "% ld", oggz_tell (oggz));287 fprintf (stderr, "%" PRI_OGGZ_OFF_T "d", oggz_tell (oggz)); 288 288 } else { 289 289 ot_fprint_time (stderr, (double)timestamp/SUBSECONDS); liboggz/trunk/src/tools/oggzdump.c
r2955 r2956 232 232 } 233 233 234 /* FIXME: on Mac OS X, off_t is 64-bits. Obviously we want a nicer235 * way to do it than this, but a quick fix is a good fix */236 #ifdef __APPLE__237 # define PRI_off_t "q"238 #else239 # define PRI_off_t "l"240 #endif241 242 234 static int 243 235 read_packet (OGGZ * oggz, ogg_packet * op, long serialno, void * user_data) … … 252 244 units = oggz_tell_units (oggz); 253 245 if (units == -1) { 254 fprintf (outfile, "%0 8" PRI_off_t"x", oggz_tell (oggz));246 fprintf (outfile, "%0" PRI_OGGZ_OFF_T "x", oggz_tell (oggz)); 255 247 } else { 256 248 time_offset = (double)units / 1000.0;
