summaryrefslogtreecommitdiff
path: root/lib/malloc/watch.c
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-10-11 14:49:26 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-10-11 15:19:40 -0700
commit011c1d1c0766c65517ebd495465c99e86edb63ec (patch)
tree30d8f6a13235af90897c3223554871ef52225462 /lib/malloc/watch.c
parent40cfaccf7b178b6239b5cd0013ef80b7ff8e503e (diff)
downloadvyatta-bash-011c1d1c0766c65517ebd495465c99e86edb63ec.tar.gz
vyatta-bash-011c1d1c0766c65517ebd495465c99e86edb63ec.zip
Update to bash-4.1
Diffstat (limited to 'lib/malloc/watch.c')
-rw-r--r--lib/malloc/watch.c39
1 files changed, 20 insertions, 19 deletions
diff --git a/lib/malloc/watch.c b/lib/malloc/watch.c
index 11ab744..00c8a82 100644
--- a/lib/malloc/watch.c
+++ b/lib/malloc/watch.c
@@ -4,19 +4,20 @@
This file is part of GNU Bash, the Bourne Again SHell.
- Bash 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, or (at your option) any later
- version.
-
- Bash 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 Bash; see the file COPYING. If not, write to the Free Software
- Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+ Bash 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 3 of the License, or
+ (at your option) any later version.
+
+ Bash 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 Bash. If not, see <http://www.gnu.org/licenses/>.
+*/
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -43,17 +44,17 @@ watch_warn (addr, file, line, type, data)
char *tag;
if (type == W_ALLOC)
- tag = _("allocated");
+ tag = "allocated";
else if (type == W_FREE)
- tag = _("freed");
+ tag = "freed";
else if (type == W_REALLOC)
- tag = _("requesting resize");
+ tag = "requesting resize";
else if (type == W_RESIZED)
- tag = _("just resized");
+ tag = "just resized";
else
- tag = _("bug: unknown operation");
+ tag = "bug: unknown operation";
- fprintf (stderr, _("malloc: watch alert: %p %s "), addr, tag);
+ fprintf (stderr, "malloc: watch alert: %p %s ", addr, tag);
if (data != (unsigned long)-1)
fprintf (stderr, "(size %lu) ", data);
fprintf (stderr, "from '%s:%d'\n", file ? file : "unknown", line);