X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fenviron.c;h=5c737578054dd2dde75951efca460ce1baa3e246;hb=59b21252a88aa6ba488cfb19686d9cbad2577e76;hp=73e278ad7ef19e00c87fbb35d243363a3191587c;hpb=12c3e59c332fbe99c416fd43825b349e0ca57dc3;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/environ.c b/gdb/environ.c
index 73e278ad7e..5c73757805 100644
--- a/gdb/environ.c
+++ b/gdb/environ.c
@@ -1,7 +1,6 @@
 /* environ.c -- library for manipulating environments for GNU.
 
-   Copyright (C) 1986, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 2000,
-   2003, 2005, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1986-2016 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,12 +15,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#define max(a, b) ((a) > (b) ? (a) : (b))
-
 #include "defs.h"
 #include "environ.h"
-#include "gdb_string.h"
+#include <algorithm>
 
 
 /* Return a new environment object.  */
@@ -31,7 +27,7 @@ make_environ (void)
 {
   struct gdb_environ *e;
 
-  e = (struct gdb_environ *) xmalloc (sizeof (struct gdb_environ));
+  e = XNEW (struct gdb_environ);
 
   e->allocated = 10;
   e->vector = (char **) xmalloc ((e->allocated + 1) * sizeof (char *));
@@ -70,7 +66,7 @@ init_environ (struct gdb_environ *e)
 
   if (e->allocated < i)
     {
-      e->allocated = max (i, e->allocated + 10);
+      e->allocated = std::max (i, e->allocated + 10);
       e->vector = (char **) xrealloc ((char *) e->vector,
 				      (e->allocated + 1) * sizeof (char *));
     }
@@ -80,10 +76,10 @@ init_environ (struct gdb_environ *e)
   while (--i >= 0)
     {
       int len = strlen (e->vector[i]);
-      char *new = (char *) xmalloc (len + 1);
+      char *newobj = (char *) xmalloc (len + 1);
 
-      memcpy (new, e->vector[i], len + 1);
-      e->vector[i] = new;
+      memcpy (newobj, e->vector[i], len + 1);
+      e->vector[i] = newobj;
     }
 }
 
@@ -162,7 +158,7 @@ set_in_environ (struct gdb_environ *e, const char *var, const char *value)
 /* Remove the setting for variable VAR from environment E.  */
 
 void
-unset_in_environ (struct gdb_environ *e, char *var)
+unset_in_environ (struct gdb_environ *e, const char *var)
 {
   int len = strlen (var);
   char **vector = e->vector;