From d7d610c117b164ecac83c0345ec43edf14dcdf81 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Thu, 28 Dec 2006 15:51:43 +0000
Subject: [PATCH]   * Shorten function names.

---
 src/fuzz.c        |  4 ++--
 src/libzzuf.c     | 18 ++++++++++--------
 src/libzzuf.h     | 14 +++++++-------
 src/load-fd.c     | 16 ++++++++--------
 src/load-stream.c | 36 ++++++++++++++++++------------------
 5 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/src/fuzz.c b/src/fuzz.c
index 796b002..8d3cb70 100644
--- a/src/fuzz.c
+++ b/src/fuzz.c
@@ -40,10 +40,10 @@ void zzuf_fuzz(int fd, uint8_t *buf, uint64_t len)
     uint64_t start, stop;
     struct fuzz *fuzz;
     uint8_t *aligned_buf;
-    unsigned long int pos = zzuf_fd_getpos(fd);
+    unsigned long int pos = zfd_getpos(fd);
     unsigned int i, j, todo;
 
-    fuzz = zzuf_fd_getfuzz(fd);
+    fuzz = zfd_getfuzz(fd);
 
     aligned_buf = buf - pos;
 
diff --git a/src/libzzuf.c b/src/libzzuf.c
index 0d04793..f15276d 100644
--- a/src/libzzuf.c
+++ b/src/libzzuf.c
@@ -51,8 +51,10 @@ struct zzuf
     int managed;
     uint64_t seed;
     uint64_t pos;
+    /* Public stuff */
     struct fuzz fuzz;
-} files[MAXFD];
+}
+files[MAXFD];
 
 /* Library initialisation shit */
 void zzuf_init(void)
@@ -117,12 +119,12 @@ void zzuf_fini(void)
 }
 
 /* fd stuff */
-int zzuf_fd_ismanaged(int fd)
+int zfd_ismanaged(int fd)
 {
     return files[fd].managed;
 }
 
-void zzuf_fd_manage(int fd)
+void zfd_manage(int fd)
 {
     files[fd].managed = 1;
     files[fd].pos = 0;
@@ -130,28 +132,28 @@ void zzuf_fd_manage(int fd)
     files[fd].fuzz.data = malloc(CHUNKBYTES);
 }
 
-void zzuf_fd_unmanage(int fd)
+void zfd_unmanage(int fd)
 {
     files[fd].managed = 0;
     free(files[fd].fuzz.data);
 }
 
-long int zzuf_fd_getpos(int fd)
+long int zfd_getpos(int fd)
 {
     return files[fd].pos;
 }
 
-void zzuf_fd_setpos(int fd, long int pos)
+void zfd_setpos(int fd, long int pos)
 {
     files[fd].pos = pos;
 }
 
-void zzuf_fd_addpos(int fd, long int off)
+void zfd_addpos(int fd, long int off)
 {
     files[fd].pos += off;
 }
 
-struct fuzz *zzuf_fd_getfuzz(int fd)
+struct fuzz *zfd_getfuzz(int fd)
 {
     return &files[fd].fuzz;
 }
diff --git a/src/libzzuf.h b/src/libzzuf.h
index bc6d4b3..15661bc 100644
--- a/src/libzzuf.h
+++ b/src/libzzuf.h
@@ -41,11 +41,11 @@ extern void zzuf_init(void) __attribute__((constructor));
 extern void zzuf_fini(void) __attribute__((destructor));
 
 /* File descriptor handling */
-extern int zzuf_fd_ismanaged(int);
-extern void zzuf_fd_manage(int);
-extern void zzuf_fd_unmanage(int);
-extern long int zzuf_fd_getpos(int);
-extern void zzuf_fd_setpos(int, long int);
-extern void zzuf_fd_addpos(int, long int);
-extern struct fuzz *zzuf_fd_getfuzz(int);
+extern int zfd_ismanaged(int);
+extern void zfd_manage(int);
+extern void zfd_unmanage(int);
+extern long int zfd_getpos(int);
+extern void zfd_setpos(int, long int);
+extern void zfd_addpos(int, long int);
+extern struct fuzz *zfd_getfuzz(int);
 
diff --git a/src/load-fd.c b/src/load-fd.c
index a5b1315..47d83c4 100644
--- a/src/load-fd.c
+++ b/src/load-fd.c
@@ -96,7 +96,7 @@ void zzuf_load_fd(void)
                           file, oflag, mode, ret); \
                 else \
                     debug(STR(fn) "(\"%s\", %i) = %i", file, oflag, ret); \
-                zzuf_fd_manage(ret); \
+                zfd_manage(ret); \
             } \
         } \
     } while(0)
@@ -121,18 +121,18 @@ ssize_t read(int fd, void *buf, size_t count)
     if(!_zzuf_ready)
         return ret;
 
-    if(!zzuf_fd_ismanaged(fd))
+    if(!zfd_ismanaged(fd))
         return ret;
 
     debug("read(%i, %p, %li) = %i", fd, buf, (long int)count, ret);
     if(ret > 0)
     {
         zzuf_fuzz(fd, buf, ret);
-        zzuf_fd_addpos(fd, ret);
+        zfd_addpos(fd, ret);
     }
 
     /* Sanity check, can be OK though (for instance with a character device) */
-    if(lseek64_orig(fd, 0, SEEK_CUR) != zzuf_fd_getpos(fd))
+    if(lseek64_orig(fd, 0, SEEK_CUR) != zfd_getpos(fd))
         debug("warning: offset inconsistency");
 
     return ret;
@@ -145,12 +145,12 @@ ssize_t read(int fd, void *buf, size_t count)
         ret = ORIG(fn)(fd, offset, whence); \
         if(!_zzuf_ready) \
             return ret; \
-        if(!zzuf_fd_ismanaged(fd)) \
+        if(!zfd_ismanaged(fd)) \
             return ret; \
         debug(STR(fn)"(%i, %lli, %i) = %lli", \
               fd, (long long int)offset, whence, (long long int)ret); \
         if(ret != (off_t)-1) \
-            zzuf_fd_setpos(fd, ret); \
+            zfd_setpos(fd, ret); \
     } while(0)
 
 off_t lseek(int fd, off_t offset, int whence)
@@ -177,11 +177,11 @@ int close(int fd)
     if(!_zzuf_ready)
         return ret;
 
-    if(!zzuf_fd_ismanaged(fd))
+    if(!zfd_ismanaged(fd))
         return ret;
 
     debug("close(%i) = %i", fd, ret);
-    zzuf_fd_unmanage(fd);
+    zfd_unmanage(fd);
 
     return ret;
 }
diff --git a/src/load-stream.c b/src/load-stream.c
index bc9a379..ccc5257 100644
--- a/src/load-stream.c
+++ b/src/load-stream.c
@@ -93,7 +93,7 @@ void zzuf_load_stream(void)
             else \
             { \
                 int fd = fileno(ret); \
-                zzuf_fd_manage(fd); \
+                zfd_manage(fd); \
                 debug(STR(fn) "(\"%s\", \"%s\") = %p", path, mode, ret); \
             } \
         } \
@@ -116,7 +116,7 @@ int fseek(FILE *stream, long offset, int whence)
     if(!_zzuf_ready)
         LOADSYM(fseek);
     fd = fileno(stream);
-    if(!_zzuf_ready || !zzuf_fd_ismanaged(fd))
+    if(!_zzuf_ready || !zfd_ismanaged(fd))
         return fseek_orig(stream, offset, whence);
 
     ret = fseek_orig(stream, offset, whence);
@@ -125,9 +125,9 @@ int fseek(FILE *stream, long offset, int whence)
     {
         switch(whence)
         {
-            case SEEK_SET: zzuf_fd_setpos(fd, offset); break;
-            case SEEK_CUR: zzuf_fd_addpos(fd, offset); break;
-            case SEEK_END: zzuf_fd_setpos(fd, ftell(stream)); break;
+            case SEEK_SET: zfd_setpos(fd, offset); break;
+            case SEEK_CUR: zfd_addpos(fd, offset); break;
+            case SEEK_END: zfd_setpos(fd, ftell(stream)); break;
         }
     }
     return ret;
@@ -141,7 +141,7 @@ size_t fread(void *ptr, size_t size, size_t nmemb, FILE *stream)
     if(!_zzuf_ready)
         LOADSYM(fread);
     fd = fileno(stream);
-    if(!_zzuf_ready || !zzuf_fd_ismanaged(fd))
+    if(!_zzuf_ready || !zfd_ismanaged(fd))
         return fread_orig(ptr, size, nmemb, stream);
 
     ret = fread_orig(ptr, size, nmemb, stream);
@@ -150,7 +150,7 @@ size_t fread(void *ptr, size_t size, size_t nmemb, FILE *stream)
     if(ret > 0)
     {
         zzuf_fuzz(fd, ptr, ret * size);
-        zzuf_fd_addpos(fd, ret * size);
+        zfd_addpos(fd, ret * size);
     }
     return ret;
 }
@@ -161,14 +161,14 @@ size_t fread(void *ptr, size_t size, size_t nmemb, FILE *stream)
         if(!_zzuf_ready) \
             LOADSYM(fn); \
         fd = fileno(stream); \
-        if(!_zzuf_ready || !zzuf_fd_ismanaged(fd)) \
+        if(!_zzuf_ready || !zfd_ismanaged(fd)) \
             return ORIG(fn)(stream); \
         ret = ORIG(fn)(stream); \
         if(ret != EOF) \
         { \
             uint8_t ch = ret; \
             zzuf_fuzz(fd, &ch, 1); \
-            zzuf_fd_addpos(fd, 1); \
+            zfd_addpos(fd, 1); \
             ret = ch; \
         } \
         debug(STR(fn)"(%p) = 0x%02x", stream, ret); \
@@ -192,7 +192,7 @@ char *fgets(char *s, int size, FILE *stream)
     if(!_zzuf_ready)
         LOADSYM(fgets);
     fd = fileno(stream);
-    if(!_zzuf_ready || !zzuf_fd_ismanaged(fd))
+    if(!_zzuf_ready || !zfd_ismanaged(fd))
         return fgets_orig(s, size, stream);
 
     if(size <= 0)
@@ -214,7 +214,7 @@ char *fgets(char *s, int size, FILE *stream)
             }
             s[i] = (char)(unsigned char)ch;
             zzuf_fuzz(fd, (uint8_t *)s + i, 1); /* rather inefficient */
-            zzuf_fd_addpos(fd, 1);
+            zfd_addpos(fd, 1);
             if(s[i] == '\n')
             {
                 s[i + 1] = '\0';
@@ -235,16 +235,16 @@ int ungetc(int c, FILE *stream)
     if(!_zzuf_ready)
         LOADSYM(ungetc);
     fd = fileno(stream);
-    if(!_zzuf_ready || !zzuf_fd_ismanaged(fd))
+    if(!_zzuf_ready || !zfd_ismanaged(fd))
         return ungetc_orig(c, stream);
 
-    zzuf_fd_addpos(fd, -1);
+    zfd_addpos(fd, -1);
     zzuf_fuzz(fd, &ch, 1);
     ret = ungetc_orig((int)ch, stream);
     if(ret >= 0)
         ret = c;
     else
-        zzuf_fd_addpos(fd, 1); /* revert what we did */
+        zfd_addpos(fd, 1); /* revert what we did */
     debug("ungetc(0x%02x, %p) = 0x%02x", c, stream, ret);
     return ret;
 }
@@ -256,12 +256,12 @@ int fclose(FILE *fp)
     if(!_zzuf_ready)
         LOADSYM(fclose);
     fd = fileno(fp);
-    if(!_zzuf_ready || !zzuf_fd_ismanaged(fd))
+    if(!_zzuf_ready || !zfd_ismanaged(fd))
         return fclose_orig(fp);
 
     ret = fclose_orig(fp);
     debug("fclose(%p) = %i", fp, ret);
-    zzuf_fd_unmanage(fd);
+    zfd_unmanage(fd);
 
     return ret;
 }
@@ -274,7 +274,7 @@ int fclose(FILE *fp)
         if(!_zzuf_ready) \
             LOADSYM(fn); \
         fd = fileno(stream); \
-        if(!_zzuf_ready || !zzuf_fd_ismanaged(fd)) \
+        if(!_zzuf_ready || !zfd_ismanaged(fd)) \
             return getdelim_orig(lineptr, n, delim, stream); \
         line = *lineptr; \
         size = line ? *n : 0; \
@@ -302,7 +302,7 @@ int fclose(FILE *fp)
                 unsigned char c = ch; \
                 zzuf_fuzz(fd, &c, 1); /* even more inefficient */ \
                 line[done++] = c; \
-                zzuf_fd_addpos(fd, 1); \
+                zfd_addpos(fd, 1); \
                 if(c == delim) \
                 { \
                     finished = 1; \