Followup to r13469. lineno has already been asserted to be != NULL.

No need to check it again.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14413

diff --git a/coregrind/m_errormgr.c b/coregrind/m_errormgr.c
index 3143d781173c8fdf6bbe3a426fa64e1feb0d6c4f..f1dd861bca95a3be3fc175c1545c997d6f2f6ea7 100644 (file)
--- a/coregrind/m_errormgr.c
+++ b/coregrind/m_errormgr.c
@@ -1119,7 +1119,7 @@ static Bool get_nbnc_line ( Int fd, HChar** bufpp, SizeT* nBufp, Int* lineno )
       while (True) {
          n = get_char(fd, &ch);
          if (n == 1 && !VG_(isspace)(ch)) break;
-         if (n == 1 && ch == '\n' && lineno)
+         if (n == 1 && ch == '\n')
             (*lineno)++;
          if (n <= 0) return True;
       }
@@ -1130,7 +1130,7 @@ static Bool get_nbnc_line ( Int fd, HChar** bufpp, SizeT* nBufp, Int* lineno )
       while (True) {
          n = get_char(fd, &ch);
          if (n <= 0) return False; /* the next call will return True */
-         if (ch == '\n' && lineno)
+         if (ch == '\n')
             (*lineno)++;
          if (ch == '\n') break;
          if (i > 0 && i == nBuf-1) {

diff --git a/include/pub_tool_errormgr.h b/include/pub_tool_errormgr.h
index 235eb674bb67262993e036f533a9668aa96fce81..427c0f076aa17cd6ad8f3051d7383b4977abcac6 100644 (file)
--- a/include/pub_tool_errormgr.h
+++ b/include/pub_tool_errormgr.h
@@ -101,8 +101,8 @@ extern Bool VG_(unique_error) ( ThreadId tid, ErrorKind ekind,
    small for the line, it will be realloc'd until big enough (updating
    *bufpp and *nBufp in the process).  (It will bomb out if the size
    gets ridiculous).  Skips leading spaces on the line.  Increments
-   *lineno with the number of lines read if lineno is non-NULL. Returns
-   True if no extra information line could be read. */
+   *lineno with the number of lines read. Returns True if no extra
+   information line could be read. */
 extern Bool VG_(get_line) ( Int fd, HChar** bufpp, SizeT* nBufp, Int* lineno );