Zach Welch <zw@superlucidity.net> fix -Wformat-security warnings (1 of 4)

[fw/openocd] / src / helper / jim-eventloop.c

diff --git a/src/helper/jim-eventloop.c b/src/helper/jim-eventloop.c
index 7858842afaa2fbb82f8d15c016aa42103c9d0483..625137047a0477902a246a1d9c82492a5c2c3dc8 100644 (file)
--- a/src/helper/jim-eventloop.c
+++ b/src/helper/jim-eventloop.c
@@ -62,9 +62,11 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <sys/select.h>
 #include <errno.h>
-       extern int errno;
+
+#include "replacements.h"
+
+
 /* --- */
 
 /* File event structure */
@@ -240,6 +242,12 @@ static Jim_TimeEvent *JimSearchNearestTimer(Jim_EventLoop *eventLoop)
     return nearest;
 }
 
+/* --- POSIX version of Jim_ProcessEvents, for now the only available --- */
+#define JIM_FILE_EVENTS 1
+#define JIM_TIME_EVENTS 2
+#define JIM_ALL_EVENTS (JIM_FILE_EVENTS|JIM_TIME_EVENTS)
+#define JIM_DONT_WAIT 4
+
 /* Process every pending time event, then every pending file event
  * (that may be registered by time event callbacks just processed).
  * Without special flags the function sleeps until some file event
@@ -269,7 +277,7 @@ int Jim_ProcessEvents(Jim_Interp *interp, int flags)
 
     /* Check file events */
     while (fe != NULL) {
-        int fd = fileno(fe->handle);
+        int fd = fileno((FILE*)fe->handle);
 
         if (fe->mask & JIM_EVENT_READABLE) 
                FD_SET(fd, &rfds);
@@ -320,7 +328,7 @@ int Jim_ProcessEvents(Jim_Interp *interp, int flags)
        } else if (retval > 0) {
             fe = eventLoop->fileEventHead;
             while(fe != NULL) {
-                int fd = fileno(fe->handle);
+                int fd = fileno((FILE*)fe->handle);
 
                // fprintf(stderr,"fd: %d mask: %02x \n",fd,fe->mask);
 
@@ -516,9 +524,7 @@ static int JimELAfterCommand(Jim_Interp *interp, int argc,
 
 /* This extension is not dynamically loaded, instead it's linked statically,
    which is why we shouldn't use the unspecific 'Jim_OnLoad' name */
-#define Jim_OnLoad Jim_EventLoopOnLoad
-
-int Jim_OnLoad(Jim_Interp *interp)
+int Jim_EventLoopOnLoad(Jim_Interp *interp)
 {
     Jim_EventLoop *eventLoop;