Get rid of wimlib/version.h

[wimlib] / src / util.c

diff --git a/src/util.c b/src/util.c
index e074b951e7d4864da2d898f4c3fa83fc9f92e4cf..3b13c503f04095beda6646a849c6185f3ad7ed37 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -5,32 +5,33 @@
 /*
  * Copyright (C) 2012, 2013 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * This file is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
  *
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
+/* Make sure the POSIX-compatible strerror_r() is declared, rather than the GNU
+ * version, which has a different return type. */
 #ifdef _GNU_SOURCE
 #  define _GNU_SOURCE_DEFINED 1
 #  undef _GNU_SOURCE
+#  ifndef _POSIX_C_SOURCE
+#    define _POSIX_C_SOURCE 200112L
+#  endif
 #endif
-/* Make sure the POSIX-compatible strerror_r() is declared, rather than the GNU
- * version, which has a different return type. */
 #include <string.h>
 #ifdef _GNU_SOURCE_DEFINED
 #  define _GNU_SOURCE
@@ -415,7 +416,6 @@ retry:
                        size++;
                        goto retry;
                }
-               ERROR("memory exhausted");
        }
        return ptr;
 }
@@ -431,10 +431,7 @@ wimlib_realloc(void *ptr, size_t size)
 {
        if (size == 0)
                size = 1;
-       ptr = (*wimlib_realloc_func)(ptr, size);
-       if (ptr == NULL)
-               ERROR("memory exhausted");
-       return ptr;
+       return (*wimlib_realloc_func)(ptr, size);
 }
 
 void *