From: Jim Kingdon <jkingdon@engr.sgi.com>
Date: Sun, 13 Mar 1994 18:37:27 +0000 (+0000)
Subject: 	* valprint.c (val_print_string): Ignore error if the error
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=79f3d5862914001d44970359a55dd1691714593c;p=binutils-gdb.git

	* valprint.c (val_print_string): Ignore error if the error
	happened after a terminating '\0'.

	* c-valprint.c (c_val_print): Never add 1 to return value from
	val_print_string; just return what it returns.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aac0a1bf503..21ee77e4ff3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 Sun Mar 13 09:45:51 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
+	* valprint.c (val_print_string): Ignore error if the error
+	happened after a terminating '\0'.
+
+	* c-valprint.c (c_val_print): Never add 1 to return value from
+	val_print_string; just return what it returns.
+
 	* target.h (enum target_signal): Add TARGET_SIGNAL_FIRST, for
 	looping through all of the enums.
 	* infrun.c (signals_info): Use it.
diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index aa0cd9db31b..905c313613a 100644
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -231,9 +231,10 @@ c_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
 	        }
 	      }
 
-	  /* Return number of characters printed, plus one for the
-	     terminating null if we have "reached the end".  */
-	  return (i + (print_max && i != print_max));
+	  /* Return number of characters printed, including the terminating
+	     '\0' if we reached the end.  val_print_string takes care including
+	     the terminating '\0' if necessary.  */
+	  return i;
 	}
       break;