Rename afs.[ch] to afs_common.[ch].

[paraslash.git] / string.c

diff --git a/string.c b/string.c
index 9ad6bfb8edd7e616e61c16acec38f9a4d5bdb8e3..8b9f1633d95be658c7a6ecc40f291a0e033943bd 100644 (file)
--- a/string.c
+++ b/string.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2004-2007 Andre Noll <maan@systemlinux.org>
  *
 /*
  * Copyright (C) 2004-2007 Andre Noll <maan@systemlinux.org>
  *

- *     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
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program 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 details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.

  */
 
 /** \file string.c memory allocation and string handling functions */
  */
 
 /** \file string.c memory allocation and string handling functions */


@@ -48,6 +36,7 @@ __must_check __malloc void *para_realloc(void *p, size_t size)
         * No need to check for NULL pointers: If p is NULL, the  call
         * to realloc is equivalent to malloc(size)
         */
         * No need to check for NULL pointers: If p is NULL, the  call
         * to realloc is equivalent to malloc(size)
         */

+       assert(size);

        if (!(p = realloc(p, size))) {
                PARA_EMERG_LOG("realloc failed (size = %zu), aborting\n",
                        size);
        if (!(p = realloc(p, size))) {
                PARA_EMERG_LOG("realloc failed (size = %zu), aborting\n",
                        size);


@@ -70,6 +59,7 @@ __must_check __malloc void *para_realloc(void *p, size_t size)
  */
 __must_check __malloc void *para_malloc(size_t size)
 {
  */
 __must_check __malloc void *para_malloc(size_t size)
 {

+       assert(size);

        void *p = malloc(size);
 
        if (!p) {
        void *p = malloc(size);
 
        if (!p) {