From: Liubov Dmitrieva <liubov.dmitrieva@intel.com>
Date: Thu, 20 Dec 2012 14:23:10 +0000 (+0400)
Subject: Inappropriate code style for Intel MPX at argp/argp-help.c. Fixed.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=144b4bd88eb1c164c4e193cc04f8e29139a15c08;p=thirdparty%2Fglibc.git

Inappropriate code style for Intel MPX at argp/argp-help.c. Fixed.
---

diff --git a/argp/argp-help.c b/argp/argp-help.c
index ace71b48c2c..80547859b3d 100644
--- a/argp/argp-help.c
+++ b/argp/argp-help.c
@@ -867,7 +867,10 @@ hol_append (struct hol *hol, struct hol *more)
 
 	  /* Fix up the short options pointers from HOL.  */
 	  for (e = entries, left = hol->num_entries; left > 0; e++, left--)
-	    e->short_options += (short_options - hol->short_options);
+	   {
+	     unsigned long offset = e->short_options - hol->short_options;
+		  e->short_options = (char *)(short_options + offset);
+		}
 
 	  /* Now add the short options from MORE, fixing up its entries
 	     too.  */