4 files changed, 15 insertions, 15 deletions

diff --git a/src/plugins/fuzz_default.sh b/src/plugins/fuzz_default.sh
index c404723..7418dff 100755
--- a/src/plugins/fuzz_default.sh
+++ b/src/plugins/fuzz_default.sh
@@ -6,11 +6,11 @@ ZZSTARTSEED=0
 ZZSTOPSEED=100
 ret=0
 # fallbacks for direct, non-"make check" usage
-if test x"$testdatadir" = x""
+if test x"${testdatadir:-NONE}" = xNONE""
 then
   testdatadir=../../test
 fi
-if test x"$bindir" = x""
+if test x"${bindir:-NONE}" = xNONE""
 then
   bindir=`grep "^prefix = " ./Makefile | cut -d ' ' -f 3`
   bindir="$bindir/bin"
diff --git a/src/plugins/gif_extractor.c b/src/plugins/gif_extractor.c
index 405eebe..3b202b5 100644
--- a/src/plugins/gif_extractor.c
+++ b/src/plugins/gif_extractor.c
@@ -36,7 +36,7 @@
  * @return -1 on error, otherwise number of bytes read
  */
 static int
-gif_read_func (GifFileType *ft,
+gif_READ_func (GifFileType *ft,
                GifByteType *bt,
                int arg)
 {
@@ -68,13 +68,13 @@ EXTRACTOR_gif_extract_method (struct EXTRACTOR_ExtractContext *ec)
   int et;
   char dims[128];
 #if defined (GIF_LIB_VERSION) || GIFLIB_MAJOR <= 4
-  if (NULL == (gif_file = DGifOpen (ec, &gif_read_func)))
+  if (NULL == (gif_file = DGifOpen (ec, &gif_READ_func)))
     return; /* not a GIF */
 #else
   int gif_error;
 
   gif_error = 0;
-  gif_file = DGifOpen (ec, &gif_read_func, &gif_error);
+  gif_file = DGifOpen (ec, &gif_READ_func, &gif_error);
   if ((gif_file == NULL) || (gif_error != 0))
   {
     if (gif_file != NULL)
diff --git a/src/plugins/old/ebml_extractor.c b/src/plugins/old/ebml_extractor.c
index f7daa9a..0d4fc91 100644
--- a/src/plugins/old/ebml_extractor.c
+++ b/src/plugins/old/ebml_extractor.c
@@ -734,7 +734,7 @@ struct ebml_state
   int reported_ebml;
   int valid_ebml;
   uint64_t ebml_version;
-  uint64_t ebml_read_version;
+  uint64_t ebml_READ_version;
   uint64_t ebml_max_id_length;
   uint64_t ebml_max_size_length;
   char *doctype;
@@ -796,7 +796,7 @@ clean_ebml_state_ebml (struct ebml_state *state)
   state->reported_ebml = 0;
   state->valid_ebml = 0;
   state->ebml_version = 1;
-  state->ebml_read_version = 1;
+  state->ebml_READ_version = 1;
   state->ebml_max_id_length = 4;
   state->ebml_max_size_length = 8;
   state->doctype = NULL;
@@ -1699,7 +1699,7 @@ EXTRACTOR_ebml_extract_method (struct EXTRACTOR_PluginList *plugin,
         state->ebml_version = uint_value;
         break;
       case EBMLID_READ_VERSION:
-        state->ebml_read_version = uint_value;
+        state->ebml_READ_version = uint_value;
         if (uint_value > 1)
         {
           /* We don't support EBML versions > 1 */
diff --git a/src/plugins/rpm_extractor.c b/src/plugins/rpm_extractor.c
index 90c5892..248217a 100644
--- a/src/plugins/rpm_extractor.c
+++ b/src/plugins/rpm_extractor.c
@@ -106,7 +106,7 @@ pipe_feeder (void *args)
     while ( (0 == p->shutdown) &&
             (done < rret) )
     {
-      if (-1 == (wret = WRITE (p->pi[1],
+      if (-1 == (wret = write (p->pi[1],
                                &buf[done],
                                rret - done)))
       {
@@ -119,7 +119,7 @@ pipe_feeder (void *args)
     if (done != rret)
       break;
   }
-  CLOSE (p->pi[1]);
+  close (p->pi[1]);
   return NULL;
 }
 
@@ -272,8 +272,8 @@ EXTRACTOR_rpm_extract_method (struct EXTRACTOR_ExtractContext *ec)
     return;
   if (0 != pthread_mutex_init (&parg.lock, NULL))
   {
-    CLOSE (parg.pi[0]);
-    CLOSE (parg.pi[1]);
+    close (parg.pi[0]);
+    close (parg.pi[1]);
     return;
   }
   if (0 != pthread_create (&pthr,
@@ -282,8 +282,8 @@ EXTRACTOR_rpm_extract_method (struct EXTRACTOR_ExtractContext *ec)
                            &parg))
   {
     pthread_mutex_destroy (&parg.lock);
-    CLOSE (parg.pi[0]);
-    CLOSE (parg.pi[1]);
+    close (parg.pi[0]);
+    close (parg.pi[1]);
     return;
   }
   rpmlogSetCallback (&discard_log_callback, NULL);
@@ -416,7 +416,7 @@ END:
   sig.sa_handler = SIG_IGN;
   sigaction (SIGALRM, &sig, &old);
   parg.shutdown = 1;
-  CLOSE (parg.pi[0]);
+  close (parg.pi[0]);
   Fclose (fdi);
   pthread_kill (pthr, SIGALRM);
   pthread_join (pthr, &unused);