aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-11-10 04:21:10 +0000
committerUlrich Drepper <drepper@redhat.com>2000-11-10 04:21:10 +0000
commit718bac29232752f6020d637a0309ac9fe2935b80 (patch)
tree17327fc80cefe7d0ab8545a00c59c089d496b15f
parent85599e53cdba552f3b288b9e79c26592da11263b (diff)
downloadglibc-718bac29232752f6020d637a0309ac9fe2935b80.tar
glibc-718bac29232752f6020d637a0309ac9fe2935b80.tar.gz
glibc-718bac29232752f6020d637a0309ac9fe2935b80.tar.bz2
glibc-718bac29232752f6020d637a0309ac9fe2935b80.zip
Update.
2000-11-07 Akim Demaille <akim@epita.fr> * malloc/obstack.c (obstack_grow, obstack_grow0): Rename the second argument `data' for consistency with the prototypes. Qualify it `const'. (obstack_copy, obstack_copy0): Rename the second argument as `address' for consistency. Qualify it `const'. * malloc/obstack.h (obstack_copy, obstack_copy0, obstack_grow) (obstack_grow0, obstack_ptr_grow, obstack_ptr_grow_fast): Qualify `const' their input argument (`data' or `address'). Adjust the corresponding macros to include `const' in casts.
-rw-r--r--ChangeLog12
-rw-r--r--malloc/obstack.c24
-rw-r--r--malloc/obstack.h18
3 files changed, 33 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e05a121f0..8a0b5adb36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2000-11-07 Akim Demaille <akim@epita.fr>
+
+ * malloc/obstack.c (obstack_grow, obstack_grow0): Rename the second
+ argument `data' for consistency with the prototypes.
+ Qualify it `const'.
+ (obstack_copy, obstack_copy0): Rename the second argument as
+ `address' for consistency. Qualify it `const'.
+ * malloc/obstack.h (obstack_copy, obstack_copy0, obstack_grow)
+ (obstack_grow0, obstack_ptr_grow, obstack_ptr_grow_fast): Qualify
+ `const' their input argument (`data' or `address').
+ Adjust the corresponding macros to include `const' in casts.
+
2000-11-06 Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
* sysdeps/posix/getaddrinfo.c: Clean-up: define family to hold
diff --git a/malloc/obstack.c b/malloc/obstack.c
index 6b32678b56..8368f28896 100644
--- a/malloc/obstack.c
+++ b/malloc/obstack.c
@@ -524,20 +524,20 @@ int (obstack_make_room) (obstack, length)
return obstack_make_room (obstack, length);
}
-void (obstack_grow) (obstack, pointer, length)
+void (obstack_grow) (obstack, data, length)
struct obstack *obstack;
- POINTER pointer;
+ const POINTER data;
int length;
{
- obstack_grow (obstack, pointer, length);
+ obstack_grow (obstack, data, length);
}
-void (obstack_grow0) (obstack, pointer, length)
+void (obstack_grow0) (obstack, data, length)
struct obstack *obstack;
- POINTER pointer;
+ const POINTER data;
int length;
{
- obstack_grow0 (obstack, pointer, length);
+ obstack_grow0 (obstack, data, length);
}
void (obstack_1grow) (obstack, character)
@@ -581,20 +581,20 @@ POINTER (obstack_alloc) (obstack, length)
return obstack_alloc (obstack, length);
}
-POINTER (obstack_copy) (obstack, pointer, length)
+POINTER (obstack_copy) (obstack, address, length)
struct obstack *obstack;
- POINTER pointer;
+ const POINTER address;
int length;
{
- return obstack_copy (obstack, pointer, length);
+ return obstack_copy (obstack, address, length);
}
-POINTER (obstack_copy0) (obstack, pointer, length)
+POINTER (obstack_copy0) (obstack, address, length)
struct obstack *obstack;
- POINTER pointer;
+ const POINTER address;
int length;
{
- return obstack_copy0 (obstack, pointer, length);
+ return obstack_copy0 (obstack, address, length);
}
#endif /* __STDC__ */
diff --git a/malloc/obstack.h b/malloc/obstack.h
index 4d49ce024b..e3c4543d5d 100644
--- a/malloc/obstack.h
+++ b/malloc/obstack.h
@@ -217,18 +217,18 @@ void obstack_init (struct obstack *obstack);
void * obstack_alloc (struct obstack *obstack, int size);
-void * obstack_copy (struct obstack *obstack, void *address, int size);
-void * obstack_copy0 (struct obstack *obstack, void *address, int size);
+void * obstack_copy (struct obstack *obstack, const void *address, int size);
+void * obstack_copy0 (struct obstack *obstack, const void *address, int size);
void obstack_free (struct obstack *obstack, void *block);
void obstack_blank (struct obstack *obstack, int size);
-void obstack_grow (struct obstack *obstack, void *data, int size);
-void obstack_grow0 (struct obstack *obstack, void *data, int size);
+void obstack_grow (struct obstack *obstack, const void *data, int size);
+void obstack_grow0 (struct obstack *obstack, const void *data, int size);
void obstack_1grow (struct obstack *obstack, int data_char);
-void obstack_ptr_grow (struct obstack *obstack, void *data);
+void obstack_ptr_grow (struct obstack *obstack, const void *data);
void obstack_int_grow (struct obstack *obstack, int data);
void * obstack_finish (struct obstack *obstack);
@@ -238,7 +238,7 @@ int obstack_object_size (struct obstack *obstack);
int obstack_room (struct obstack *obstack);
void obstack_make_room (struct obstack *obstack, int size);
void obstack_1grow_fast (struct obstack *obstack, int data_char);
-void obstack_ptr_grow_fast (struct obstack *obstack, void *data);
+void obstack_ptr_grow_fast (struct obstack *obstack, const void *data);
void obstack_int_grow_fast (struct obstack *obstack, int data);
void obstack_blank_fast (struct obstack *obstack, int size);
@@ -385,7 +385,7 @@ __extension__ \
int __len = (length); \
if (__o->next_free + __len > __o->chunk_limit) \
_obstack_newchunk (__o, __len); \
- _obstack_memcpy (__o->next_free, (char *) (where), __len); \
+ _obstack_memcpy (__o->next_free, (const char *) (where), __len); \
__o->next_free += __len; \
(void) 0; })
@@ -395,7 +395,7 @@ __extension__ \
int __len = (length); \
if (__o->next_free + __len + 1 > __o->chunk_limit) \
_obstack_newchunk (__o, __len + 1); \
- _obstack_memcpy (__o->next_free, (char *) (where), __len); \
+ _obstack_memcpy (__o->next_free, (const char *) (where), __len); \
__o->next_free += __len; \
*(__o->next_free)++ = 0; \
(void) 0; })
@@ -417,7 +417,7 @@ __extension__ \
({ struct obstack *__o = (OBSTACK); \
if (__o->next_free + sizeof (void *) > __o->chunk_limit) \
_obstack_newchunk (__o, sizeof (void *)); \
- *((void **)__o->next_free)++ = ((void *)datum); \
+ *((void **)__o->next_free)++ = ((const void *)datum); \
(void) 0; })
# define obstack_int_grow(OBSTACK,datum) \