X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Fenviron.c;h=1f9a9d67e9fe9ba98fc7a1d9e5e896dfc1805043;hb=02e423b9b296edcf2fc50161c361062727a3263d;hp=c4a5adc375489dcc8a6030c7fed8bd95050c32ec;hpb=dc9e099fc0eced486ae2b49455c9da113c11f4ff;p=binutils-gdb.git

diff --git a/gdb/environ.c b/gdb/environ.c
index c4a5adc3754..1f9a9d67e9f 100644
--- a/gdb/environ.c
+++ b/gdb/environ.c
@@ -1,5 +1,6 @@
 /* environ.c -- library for manipulating environments for GNU.
-   Copyright (C) 1986, 1989 Free Software Foundation, Inc.
+   Copyright 1986, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 2000
+   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
@@ -22,13 +23,12 @@
 #include "defs.h"
 #include "environ.h"
 #include "gdb_string.h"
-#include "gdbcore.h"
 
 
 /* Return a new environment object.  */
 
 struct environ *
-make_environ ()
+make_environ (void)
 {
   register struct environ *e;
 
@@ -43,15 +43,14 @@ make_environ ()
 /* Free an environment and all the strings in it.  */
 
 void
-free_environ (e)
-     register struct environ *e;
+free_environ (register struct environ *e)
 {
   register char **vector = e->vector;
 
   while (*vector)
-    free (*vector++);
+    xfree (*vector++);
 
-  free (e);
+  xfree (e);
 }
 
 /* Copy the environment given to this process into E.
@@ -59,8 +58,7 @@ free_environ (e)
    that all strings in these environments are safe to free.  */
 
 void
-init_environ (e)
-     register struct environ *e;
+init_environ (register struct environ *e)
 {
   extern char **environ;
   register int i;
@@ -92,8 +90,7 @@ init_environ (e)
    This is used to get something to pass to execve.  */
 
 char **
-environ_vector (e)
-     struct environ *e;
+environ_vector (struct environ *e)
 {
   return e->vector;
 }
@@ -101,9 +98,7 @@ environ_vector (e)
 /* Return the value in environment E of variable VAR.  */
 
 char *
-get_in_environ (e, var)
-     const struct environ *e;
-     const char *var;
+get_in_environ (const struct environ *e, const char *var)
 {
   register int len = strlen (var);
   register char **vector = e->vector;
@@ -119,10 +114,7 @@ get_in_environ (e, var)
 /* Store the value in E of VAR as VALUE.  */
 
 void
-set_in_environ (e, var, value)
-     struct environ *e;
-     const char *var;
-     const char *value;
+set_in_environ (struct environ *e, const char *var, const char *value)
 {
   register int i;
   register int len = strlen (var);
@@ -145,7 +137,7 @@ set_in_environ (e, var, value)
       vector[i + 1] = 0;
     }
   else
-    free (s);
+    xfree (s);
 
   s = (char *) xmalloc (len + strlen (value) + 2);
   strcpy (s, var);
@@ -169,9 +161,7 @@ set_in_environ (e, var, value)
 /* Remove the setting for variable VAR from environment E.  */
 
 void
-unset_in_environ (e, var)
-     struct environ *e;
-     char *var;
+unset_in_environ (struct environ *e, char *var)
 {
   register int len = strlen (var);
   register char **vector = e->vector;
@@ -181,7 +171,7 @@ unset_in_environ (e, var)
     {
       if (STREQN (s, var, len) && s[len] == '=')
 	{
-	  free (s);
+	  xfree (s);
 	  /* Walk through the vector, shuffling args down by one, including
 	     the NULL terminator.  Can't use memcpy() here since the regions
 	     overlap, and memmove() might not be available. */