[ViewVC] Diff of: cvs/libev/ev.c

Comparing libev/ev.c (file contents):
Revision 1.329 by root, Tue Feb 16 09:32:39 2010 UTC vs.
Revision 1.333 by root, Tue Mar 9 08:58:22 2010 UTC

 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 # ifndef EV_SELECT_IS_WINSOCKET
 #  define EV_SELECT_IS_WINSOCKET 1
 # endif
+# undef EV_AVOID_STDIO
 #endif
 /* this block tries to deduce configuration from header-defined symbols and defaults */
 /* try to deduce the maximum number of signals on this platform */
 # include "ev_win32.c"
 #endif
 /*****************************************************************************/
+#if EV_AVOID_STDIO
+static void noinline
+ev_printerr (const char *msg)
+{
+  write (STDERR_FILENO, msg, strlen (msg));
+}
+#endif
 static void (*syserr_cb)(const char *msg);
 void
 ev_set_syserr_cb (void (*cb)(const char *msg))
 {
   if (syserr_cb)
     syserr_cb (msg);
   else
     {
+#if EV_AVOID_STDIO
+      const char *err = strerror (errno);
+      ev_printerr (msg);
+      ev_printerr (": ");
+      ev_printerr (err);
+      ev_printerr ("\n");
+#else
       perror (msg);
+#endif
       abort ();
     }
 }
 static void *
 {
   ptr = alloc (ptr, size);
   if (!ptr && size)
     {
+#if EV_AVOID_STDIO
+      ev_printerr ("libev: memory allocation failed, aborting.\n");
+#else
       fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
+#endif
       abort ();
     }
   return ptr;
 }
       infy_wd (EV_A_ ev->wd, ev->wd, ev);
       ofs += sizeof (struct inotify_event) + ev->len;
     }
 }
+inline_size unsigned int
+ev_linux_version (void)
+{
+  struct utsname buf;
+  unsigned int v;
+  int i;
+  char *p = buf.release;
+  if (uname (&buf))
+    return 0;
+  for (i = 3+1; --i; )
+    {
+      unsigned int c = 0;
+      for (;;)
+        {
+          if (*p >= '0' && *p <= '9')
+            c = c * 10 + *p++ - '0';
+          else
+            {
+              p += *p == '.';
+              break;
+            }
+        }
+      v = (v << 8) | c;
+    }
+  return v;
+}
 inline_size void
-check_2625 (EV_P)
+ev_check_2625 (EV_P)
 {
   /* kernels < 2.6.25 are borked
    * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
    */
-  struct utsname buf;
+  if (ev_linux_version () < 0x020619)
-  int major, minor, micro;
-  if (uname (&buf))
-    return;
-  if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
-    return;
-  if (major < 2
-      || (major == 2 && minor < 6)
-      || (major == 2 && minor == 6 && micro < 25))
     return;
   fs_2625 = 1;
 }
   if (fs_fd != -2)
     return;
   fs_fd = -1;
-  check_2625 (EV_A);
+  ev_check_2625 (EV_A);
   fs_fd = infy_newfd ();
   if (fs_fd >= 0)
     {

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing libev/ev.c (file contents): Revision 1.329 by root, Tue Feb 16 09:32:39 2010 UTC vs. Revision 1.333 by root, Tue Mar 9 08:58:22 2010 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.329 by root, Tue Feb 16 09:32:39 2010 UTC vs.
Revision 1.333 by root, Tue Mar 9 08:58:22 2010 UTC