Changeset 4032Tweet

Timestamp:

Nov 25, 2009, 1:42:32 AM (11 years ago)

Author:

Sam Hocevar

Message:

Minor refactoring in lib-stream.c.

File:

• zzuf/trunk/src/lib-stream.c (modified) (16 diffs)

zzuf/trunk/src/lib-stream.c

@@ -26 +26 @@
 /* Define if stdio operations use *only* the refill mechanism */
 #if defined HAVE___SREFILL
-#   define REFILL_ONLY_STDIO
+#   define HAVE_DARWIN_STDIO
+#elif defined HAVE___FILBUF || defined HAVE___SRGET || defined HAVE___UFLOW
+#   define HAVE_BSD_STDIO
 #endif
 
@@ -162 +164 @@
 static inline uint8_t *get_stream_ptr(FILE *stream)
 {
-#if defined HAVE___FILBUF || defined HAVE___SRGET || defined HAVE___UFLOW
+#if defined HAVE_BSD_STDIO
     return (uint8_t *)stream->FILE_PTR;
 #else
@@ -171 +173 @@
 static inline int get_stream_off(FILE *stream)
 {
-#if defined HAVE___FILBUF || defined HAVE___SRGET || defined HAVE___UFLOW
+#if defined HAVE_BSD_STDIO
     return (int)((uint8_t *)stream->FILE_PTR - (uint8_t *)stream->FILE_BASE);
 #else
@@ -182 +184 @@
 #if defined HAVE_GLIBC_FP
     return (int)((uint8_t *)stream->FILE_CNT - (uint8_t *)stream->FILE_PTR);
-#elif defined HAVE___FILBUF || defined HAVE___SRGET || defined HAVE___UFLOW
+#elif defined HAVE_BSD_STDIO
     return stream->FILE_CNT;
 #else
@@ -197 +199 @@
  */
 
-#if defined REFILL_ONLY_STDIO /* Fuzz fp if we have __srefill() */
+#if defined HAVE_DARWIN_STDIO /* Fuzz fp if we have __srefill() */
 #   define FOPEN_FUZZ() \
     _zz_fuzz(fd, get_stream_ptr(ret), get_stream_cnt(ret))
@@ -293 +295 @@
  */
 
-#if defined REFILL_ONLY_STDIO /* Don't fuzz or seek if we have __srefill() */
+#if defined HAVE_DARWIN_STDIO /* Don't fuzz or seek if we have __srefill() */
 #   define FSEEK_FUZZ(myftell)
 #else
@@ -417 +419 @@
     debug("%s([%i])", __func__, fd);
 
-#if defined REFILL_ONLY_STDIO /* Don't fuzz or seek if we have __srefill() */
+#if defined HAVE_DARWIN_STDIO /* Don't fuzz or seek if we have __srefill() */
 #else
     /* FIXME: check what happens when rewind()ing a pipe */
@@ -431 +433 @@
  * __srget or __uflow, and store it in already_fuzzed. If these functions
  * are not available, do nothing. */
-#if defined HAVE___FILBUF || defined HAVE___SRGET || defined HAVE___UFLOW
+#if defined HAVE_BSD_STDIO
 #   define FREAD_PREFUZZ(fd, oldpos) \
     do \
@@ -449 +451 @@
  * have __srefill, we just do nothing because that function is the only
  * one that actually fuzzes things. */
-#if defined REFILL_ONLY_STDIO
+#if defined HAVE_DARWIN_STDIO
 #   define FREAD_FUZZ(fd, oldpos) \
     do \
@@ -539 +541 @@
  */
 
-#if defined HAVE___FILBUF || defined HAVE___SRGET || defined HAVE___UFLOW
+#if defined HAVE_BSD_STDIO
 #   define FGETC_PREFUZZ already_fuzzed = _zz_getfuzzed(fd);
 #else
@@ -545 +547 @@
 #endif
 
-#if defined REFILL_ONLY_STDIO /* Don't fuzz or seek if we have __srefill() */
+#if defined HAVE_DARWIN_STDIO /* Don't fuzz or seek if we have __srefill() */
 #   define FGETC_FUZZ
 #else
@@ -631 +633 @@
  */
 
-#if defined REFILL_ONLY_STDIO /* Don't fuzz or seek if we have __srefill() */
+#if defined HAVE_DARWIN_STDIO /* Don't fuzz or seek if we have __srefill() */
 #   define FGETS_FUZZ(myfgets, myfgetc) \
         _zz_lock(fd); \
@@ -722 +724 @@
         fuzz->upos = _zz_getpos(fd) - 1;
         fuzz->uchar = c;
-#if defined REFILL_ONLY_STDIO /* Don't fuzz or seek if we have __srefill() */
+#if defined HAVE_DARWIN_STDIO /* Don't fuzz or seek if we have __srefill() */
 #else
         _zz_addpos(fd, -1);
@@ -853 +855 @@
 {
     char *ret;
-#if defined REFILL_ONLY_STDIO /* Don't fuzz or seek if we have __srefill() */
+#if defined HAVE_DARWIN_STDIO /* Don't fuzz or seek if we have __srefill() */
 #else
     struct fuzz *fuzz;
@@ -867 +869 @@
 
     DEBUG_STREAM("old", stream);
-#if defined REFILL_ONLY_STDIO /* Don't fuzz or seek if we have __srefill() */
+#if defined HAVE_DARWIN_STDIO /* Don't fuzz or seek if we have __srefill() */
     _zz_lock(fd);
     ret = ORIG(fgetln)(stream, len);
@@ -910 +912 @@
  */
 
-#if defined HAVE___SREFILL || defined HAVE___FILBUF || defined HAVE___SRGET
+#if defined HAVE___UFLOW
+#   define REFILL_RETURNS_INT 0
+#else
 #   define REFILL_RETURNS_INT 1
-#elif defined HAVE___UFLOW
-#   define REFILL_RETURNS_INT 0
 #endif