You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by rh...@apache.org on 2015/09/14 18:40:56 UTC

svn commit: r1702991 - /subversion/trunk/subversion/libsvn_subr/token.c

Author: rhuijben
Date: Mon Sep 14 16:40:56 2015
New Revision: 1702991

URL: http://svn.apache.org/r1702991
Log:
Following up on r1702974, undo change to token parser as APR already
handles the formatting of NULL for %s in errors.

* subversion/libsvn_subr/token.c
  (svn_token__from_word_err): Revert NULL handling.

Suggested by: ivan

Modified:
    subversion/trunk/subversion/libsvn_subr/token.c

Modified: subversion/trunk/subversion/libsvn_subr/token.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/token.c?rev=1702991&r1=1702990&r2=1702991&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/token.c (original)
+++ subversion/trunk/subversion/libsvn_subr/token.c Mon Sep 14 16:40:56 2015
@@ -64,7 +64,7 @@ svn_token__from_word_err(int *value,
   if (*value == SVN_TOKEN_UNKNOWN)
     return svn_error_createf(SVN_ERR_BAD_TOKEN, NULL,
                              _("Token '%s' is unrecognized"),
-                             word ? word : "(null)");
+                             word);
 
   return SVN_NO_ERROR;
 }