Inline strnlen() and use it

[vlc] / include / vlc_fixups.h

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index ca9c667925d844fa3a38c1e68e0464ee48b03c7d..cd7dc8288a236f6c2f2b2fe1e5dc3b4b9eb3bf28 100644 (file)
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -1,8 +1,7 @@
 /*****************************************************************************
  * fixups.h: portability fixups included from config.h
  *****************************************************************************
- * Copyright © 1998-2007 the VideoLAN project
- * $Id$
+ * Copyright © 1998-2008 the VideoLAN project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,8 +23,20 @@
  * This file is a collection of portability fixes
  */
 
+#ifndef LIBVLC_FIXUPS_H
+# define LIBVLC_FIXUPS_H 1
+
+# include <string.h>
+# include <stdlib.h>
+
 #ifndef HAVE_STRDUP
-# define strdup vlc_strdup
+static inline char *strdup (const char *str)
+{
+    size_t len = strlen (str) + 1;
+    char *res = malloc (len);
+    if (res) memcpy (res, str, len);
+    return res;
+}
 #endif
 
 #ifndef HAVE_VASPRINTF
@@ -36,38 +47,59 @@
 # define asprintf vlc_asprintf
 #endif
 
-#ifndef HAVE_STRNDUP
-# define strndup vlc_strndup
+#ifndef HAVE_STRNLEN
+static inline size_t strnlen (const char *str, size_t max)
+{
+    const char *end = memchr (str, 0, max);
+    return end ? (size_t)(end - str) : max;
+}
 #endif
 
-#ifndef HAVE_STRNLEN
-# define strnlen vlc_strnlen
+#ifndef HAVE_STRNDUP
+static inline char *strndup (const char *str, size_t max)
+{
+    size_t len = strnlen (str, max);
+    char *res = malloc (len + 1);
+    if (res)
+    {
+        memcpy (res, str, len);
+        res[len] = '\0';
+    }
+    return res;
+}
 #endif
 
 #ifndef HAVE_STRLCPY
 # define strlcpy vlc_strlcpy
 #endif
 
-#ifndef HAVE_ATOF
-# define atof vlc_atof
-#endif
-
 #ifndef HAVE_STRTOF
-# ifdef HAVE_STRTOD
-#  define strtof( a, b ) ((float)strtod (a, b))
-# endif
+# define strtof( a, b ) ((float)strtod (a, b))
 #endif
 
-#ifndef HAVE_ATOLL
-# define atoll vlc_atoll
+#ifndef HAVE_ATOF
+# define atof( str ) (strtod ((str), (char **)NULL, 10))
 #endif
 
 #ifndef HAVE_STRTOLL
 # define strtoll vlc_strtoll
 #endif
 
+#ifndef HAVE_ATOLL
+# define atoll( str ) (strtoll ((str), (char **)NULL, 10))
+#endif
+
 #ifndef HAVE_LLDIV
-# define lldiv vlc_lldiv
+typedef struct {
+    long long quot; /* Quotient. */
+    long long rem;  /* Remainder. */
+} lldiv_t;
+
+static inline lldiv_t lldiv (long long numer, long long denom)
+{
+    lldiv_t d = { .quot = numer / denom, .rem = numer % denom };
+    return d;
+}
 #endif
 
 #ifndef HAVE_SCANDIR
@@ -76,7 +108,11 @@
 #endif
 
 #ifndef HAVE_GETENV
-# define getenv vlc_getenv
+static inline getenv (const char *name)
+{
+    (void)name;
+    return NULL;
+}
 #endif
 
 #ifndef HAVE_STRCASECMP
@@ -107,7 +143,7 @@
 /* If localtime_r() is not provided, we assume localtime() uses
  * thread-specific storage. */
 # include <time.h>
-static struct tm *localtime_r (const time_t *timep, struct tm *result)
+static inline struct tm *localtime_r (const time_t *timep, struct tm *result)
 {
     struct tm *s = localtime (timep);
     if (s == NULL)
@@ -116,5 +152,41 @@ static struct tm *localtime_r (const time_t *timep, struct tm *result)
     *result = *s;
     return result;
 }
+static inline struct tm *gmtime_r (const time_t *timep, struct tm *result)
+{
+    struct tm *s = gmtime (timep);
+    if (s == NULL)
+        return NULL;
+
+    *result = *s;
+    return result;
+}
+#endif
+
+#ifndef HAVE_USELOCALE
+typedef void *locale_t;
+# define newlocale( a, b, c ) ((locale_t)0)
+# define uselocale( a ) ((locale_t)0)
+# define freelocale( a ) (void)0
+#endif
+
+#ifdef WIN32
+# include <dirent.h>
+# define opendir Use_utf8_opendir_or_vlc_wopendir_instead!
+# define readdir Use_utf8_readdir_or_vlc_wreaddir_instead!
+# define closedir vlc_wclosedir
 #endif
 
+/* libintl support */
+#define _(str) vlc_gettext (str)
+
+#if defined (ENABLE_NLS)
+# include <libintl.h>
+#else
+# define dgettext(dom, str) ((char *)(str))
+#endif
+
+#define N_(str) gettext_noop (str)
+#define gettext_noop(str) (str)
+
+#endif /* !LIBVLC_FIXUPS_H */