Changeset 4810 for zzuf/trunk/src/libzzuf/lib-stream.c
- Timestamp:
- 04/17/12 01:09:37 (13 months ago)
- File:
-
- 1 edited
-
zzuf/trunk/src/libzzuf/lib-stream.c (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
-
zzuf/trunk/src/libzzuf/lib-stream.c
r4663 r4810 517 517 int64_t oldpos, newpos; \ 518 518 uint8_t *b = ptr;\ 519 int old off, oldcnt; \519 int oldcnt; \ 520 520 int fd; \ 521 521 LOADSYM(myfread); \ … … 527 527 /* FIXME: ftell() will return -1 on a pipe such as stdin */ \ 528 528 oldpos = ZZ_FTELL(stream); \ 529 oldoff = get_stream_off(stream); \530 529 oldcnt = get_stream_cnt(stream); \ 531 530 _zz_lock(fd); \ … … 608 607 do { \ 609 608 int64_t oldpos, newpos; \ 610 int old off, oldcnt; \609 int oldcnt; \ 611 610 int fd; \ 612 611 LOADSYM(myfgetc); \ … … 617 616 debug_stream("before", s); \ 618 617 oldpos = ZZ_FTELL(s); \ 619 oldoff = get_stream_off(s); \620 618 oldcnt = get_stream_cnt(s); \ 621 619 _zz_lock(fd); \ … … 704 702 { \ 705 703 int64_t oldpos, newpos; \ 706 int old off, oldcnt; \704 int oldcnt; \ 707 705 int fd; \ 708 706 ret = s; \ … … 715 713 debug_stream("before", stream); \ 716 714 oldpos = ZZ_FTELL(stream); \ 717 oldoff = get_stream_off(stream); \718 715 oldcnt = get_stream_cnt(stream); \ 719 716 newpos = oldpos; \ … … 748 745 } \ 749 746 oldpos = newpos; \ 750 oldoff = get_stream_off(stream); \751 747 oldcnt = get_stream_cnt(stream); \ 752 748 if(chr == EOF) \ … … 869 865 char *line; \ 870 866 ssize_t done, size; \ 871 int old off, oldcnt; \867 int oldcnt; \ 872 868 int fd, finished = 0; \ 873 869 LOADSYM(mygetdelim); \ … … 880 876 debug_stream("before", stream); \ 881 877 oldpos = ZZ_FTELL(stream); \ 882 oldoff = get_stream_off(stream); \883 878 oldcnt = get_stream_cnt(stream); \ 884 879 newpos = oldpos; \ … … 918 913 } \ 919 914 oldpos = newpos; \ 920 oldoff = get_stream_off(stream); \921 915 oldcnt = get_stream_cnt(stream); \ 922 916 if(chr == EOF) \
Note: See TracChangeset
for help on using the changeset viewer.
