Fix ARI warnings in d-exp.y

This fixes four ARI warnings found in d-exp.y.

This is comprised of three uses of the && or || at the end of a line, and one
use of sprintf.

gdb/ChangeLog

	* d-exp.y (PrimaryExpression : TypeExp '.' IdentifierExp): Use
	xstrprintf instead of malloc and sprintf.
	(PrimaryExpression : IdentifierExp): Avoid operator at end of line.
	(lex_one_token): Likewise.

2 files changed, 18 insertions, 10 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index be3248e..37950b4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2015-08-14  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* d-exp.y (PrimaryExpression : TypeExp '.' IdentifierExp): Use
+	xstrprintf instead of malloc and sprintf.
+	(PrimaryExpression : IdentifierExp): Avoid operator at end of line.
+	(lex_one_token): Likewise.
+
 2015-08-14  Matthew Fortune  <matthew.fortune@imgtec.com>
 
 	* solib-svr4.c (read_program_header): Add base_addr argument to
diff --git a/gdb/d-exp.y b/gdb/d-exp.y
index bcf62ba..e23a0aa 100644
--- a/gdb/d-exp.y
+++ b/gdb/d-exp.y
@@ -475,8 +475,8 @@ PrimaryExpression:
 		    {
 		      if (symbol_read_needs_frame (sym.symbol))
 			{
-			  if (innermost_block == 0 ||
-			      contained_in (sym.block, innermost_block))
+			  if (innermost_block == 0
+			      || contained_in (sym.block, innermost_block))
 			    innermost_block = sym.block;
 			}
 
@@ -491,8 +491,8 @@ PrimaryExpression:
 		     {
 		      /* It hangs off of `this'.  Must not inadvertently convert from a
 			 method call to data ref.  */
-		      if (innermost_block == 0 ||
-			  contained_in (sym.block, innermost_block))
+		      if (innermost_block == 0
+			  || contained_in (sym.block, innermost_block))
 			innermost_block = sym.block;
 		      write_exp_elt_opcode (pstate, OP_THIS);
 		      write_exp_elt_opcode (pstate, OP_THIS);
@@ -524,11 +524,12 @@ PrimaryExpression:
 			      struct block_symbol sym;
 			      const char *typename = TYPE_SAFE_NAME (type);
 			      int typename_len = strlen (typename);
-			      char *name = malloc (typename_len + $3.length + 1);
+			      char *name;
 
-			      make_cleanup (free, name);
-			      sprintf (name, "%.*s.%.*s",
-				       typename_len, typename, $3.length, $3.ptr);
+			      name = xstrprintf ("%.*s.%.*s",
+						 typename_len, typename,
+						 $3.length, $3.ptr);
+			      make_cleanup (xfree, name);
 
 			      sym =
 				lookup_symbol (name, (const struct block *) NULL,
@@ -1207,8 +1208,8 @@ lex_one_token (struct parser_state *par_state)
 	    /* We will take any letters or digits, ignoring any embedded '_'.
 	       parse_number will complain if past the radix, or if L or U are
 	       not final.  */
-	    else if ((*p < '0' || *p > '9') && (*p != '_') &&
-		     ((*p < 'a' || *p > 'z') && (*p < 'A' || *p > 'Z')))
+	    else if ((*p < '0' || *p > '9') && (*p != '_')
+		     && ((*p < 'a' || *p > 'z') && (*p < 'A' || *p > 'Z')))
 	      break;
 	  }