[Cvs-cvs] ccvs/src ChangeLog buffer.c zlib.c

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Mark D. Baushke <address@hidden>        06/01/27 17:15:33

Modified files:
        src            : ChangeLog buffer.c zlib.c 

Log message:
        Dump pagealign_alloc in favor of malloc to avoid mmap() problems.
        * buffer.c: Remove include of pagealign_alloc.h
        (get_buffer_data): s/pagealign_xalloc/xmalloc/
        (buf_free_datas): s/pagealign_free/free/
        * zlib.c: Remove include of pagealign_alloc.h
        (compress_buffer_input): s/pagealign_xalloc/xmalloc/
        (compress_buffer_output): Ditto.
        (compress_buffer_flush): Ditto.
        (compress_buffer_shutdown_output): Ditto.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3337&tr2=1.3338&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/buffer.c.diff?tr1=1.65&tr2=1.66&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/zlib.c.diff?tr1=1.32&tr2=1.33&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3337 ccvs/src/ChangeLog:1.3338
--- ccvs/src/ChangeLog:1.3337   Mon Jan 16 19:06:05 2006
+++ ccvs/src/ChangeLog  Fri Jan 27 17:15:33 2006
@@ -1,3 +1,15 @@
+2006-01-26  Mark D. Baushke  <address@hidden>
+
+       Dump pagealign_alloc in favor of malloc to avoid mmap() problems.
+       * buffer.c: Remove include of pagealign_alloc.h
+       (get_buffer_data): s/pagealign_xalloc/xmalloc/
+       (buf_free_datas): s/pagealign_free/free/
+       * zlib.c: Remove include of pagealign_alloc.h
+       (compress_buffer_input): s/pagealign_xalloc/xmalloc/
+       (compress_buffer_output): Ditto.
+       (compress_buffer_flush): Ditto.
+       (compress_buffer_shutdown_output): Ditto.
+
 2006-01-16  Derek Price  <address@hidden>
 
        * sanity.sh (join-16a): Test "no such tag" error with -j.
Index: ccvs/src/buffer.c
diff -u ccvs/src/buffer.c:1.65 ccvs/src/buffer.c:1.66
--- ccvs/src/buffer.c:1.65      Wed Dec  7 09:17:20 2005
+++ ccvs/src/buffer.c   Fri Jan 27 17:15:33 2006
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2005 The Free Software Foundation, Inc.
+ * Copyright (C) 1996-2006 The Free Software Foundation, Inc.
  *
  * 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
@@ -16,7 +16,6 @@
 
 #include "cvs.h"
 #include "buffer.h"
-#include "pagealign_alloc.h"
 
 #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
 
@@ -105,7 +104,7 @@
     struct buffer_data *ret;
 
     ret = xmalloc (sizeof (struct buffer_data));
-    ret->text = pagealign_xalloc (BUFFER_DATA_SIZE);
+    ret->text = xmalloc (BUFFER_DATA_SIZE);
 
     return ret;
 }
@@ -256,7 +255,7 @@
     {
        p = b;
        n = b->next;
-       pagealign_free (b->text);
+       free (b->text);
        free (b);
        b = n;
     } while (p != last);
Index: ccvs/src/zlib.c
diff -u ccvs/src/zlib.c:1.32 ccvs/src/zlib.c:1.33
--- ccvs/src/zlib.c:1.32        Fri Oct 28 14:10:59 2005
+++ ccvs/src/zlib.c     Fri Jan 27 17:15:33 2006
@@ -18,7 +18,6 @@
 
 #include "cvs.h"
 #include "buffer.h"
-#include "pagealign_alloc.h"
 
 #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
 
@@ -154,7 +153,7 @@
        bd = xmalloc (sizeof (struct buffer_data));
        if (bd == NULL)
            return -2;
-       bd->text = pagealign_xalloc (BUFFER_DATA_SIZE);
+       bd->text = xmalloc (BUFFER_DATA_SIZE);
        if (bd->text == NULL)
        {
            free (bd);
@@ -286,7 +285,7 @@
      */
     static char *buffer = NULL;
     if (!buffer)
-       buffer = pagealign_xalloc (BUFFER_DATA_SIZE);
+       buffer = xmalloc (BUFFER_DATA_SIZE);
 
     if (cb->level != gzip_level)
     {
@@ -337,7 +336,7 @@
      */
     static char *buffer = NULL;
     if (!buffer)
-       buffer = pagealign_xalloc (BUFFER_DATA_SIZE);
+       buffer = xmalloc (BUFFER_DATA_SIZE);
 
     cb->zstr.avail_in = 0;
     cb->zstr.next_in = NULL;
@@ -442,7 +441,7 @@
      */
     static char *buffer = NULL;
     if (!buffer)
-       buffer = pagealign_xalloc (BUFFER_DATA_SIZE);
+       buffer = xmalloc (BUFFER_DATA_SIZE);
 
     do
     {