[med-svn] r22706 - in trunk/packages/snap/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2016-08-24 10:23:03 +0000 (Wed, 24 Aug 2016)
New Revision: 22706

Added:
   trunk/packages/snap/trunk/debian/patches/replace_itoa_with_broken_indentation.patch
Modified:
   trunk/packages/snap/trunk/debian/changelog
   trunk/packages/snap/trunk/debian/patches/build-with-gcc-6.patch
   trunk/packages/snap/trunk/debian/patches/series
Log:
itoa implementation had broken identation - use sprintf instead


Modified: trunk/packages/snap/trunk/debian/changelog
===================================================================
--- trunk/packages/snap/trunk/debian/changelog	2016-08-24 04:38:43 UTC (rev 22705)
+++ trunk/packages/snap/trunk/debian/changelog	2016-08-24 10:23:03 UTC (rev 22706)
@@ -1,3 +1,9 @@
+snap (2013-11-29-4) UNRELEASED; urgency=medium
+
+  * itoa implementation had broken identation - use sprintf instead
+
+ -- Andreas Tille <tille at debian.org>  Wed, 24 Aug 2016 10:43:36 +0200
+
 snap (2013-11-29-3) unstable; urgency=medium
 
   * Team upload.

Modified: trunk/packages/snap/trunk/debian/patches/build-with-gcc-6.patch
===================================================================
--- trunk/packages/snap/trunk/debian/patches/build-with-gcc-6.patch	2016-08-24 04:38:43 UTC (rev 22705)
+++ trunk/packages/snap/trunk/debian/patches/build-with-gcc-6.patch	2016-08-24 10:23:03 UTC (rev 22706)
@@ -50,18 +50,3 @@
  void zoeDeleteScoreSystem (zoeScoreSystem s) {
  	int i;
  	for (i = 0; i < 22; i++) zoeFree(s->score[i]);
---- a/Zoe/zoeTools.c
-+++ b/Zoe/zoeTools.c
-@@ -149,10 +149,11 @@
- 	do {
- 		s[i++] = n % 10 + '0';
- 	} while ((n /= 10) > 0);
--	if (sign < 0)
-+	if (sign < 0) {
- 		s[i++] = '-';
- 		s[i] = '\0';
- 		reverse_string(s);
-+	}
- }
- 
- /* coor_t */

Added: trunk/packages/snap/trunk/debian/patches/replace_itoa_with_broken_indentation.patch
===================================================================
--- trunk/packages/snap/trunk/debian/patches/replace_itoa_with_broken_indentation.patch	                        (rev 0)
+++ trunk/packages/snap/trunk/debian/patches/replace_itoa_with_broken_indentation.patch	2016-08-24 10:23:03 UTC (rev 22706)
@@ -0,0 +1,37 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 24 Aug 2016 10:43:36 +0200
+Description: itoa implementation had broken identation - use
+ sprintf instead
+
+--- a/Zoe/zoeTools.c
++++ b/Zoe/zoeTools.c
+@@ -131,28 +131,8 @@ void zoeParseOptions (int * argc, char *
+  Typedef I/O
+ \******************************************************************************/
+ 
+-static void reverse_string (char * s) {
+-	int c, i, j;
+-
+-	for (i = 0, j = strlen(s) -1; i < j; i++, j--) {
+-		c = s[i];
+-		s[i] = s[j];
+-		s[j] = c;
+-	}
+-}
+-
+ static void itoa (int n, char * s) {
+-	int i, sign;
+-		
+-	if ((sign = n) < 0) n = -n;
+-	i = 0;
+-	do {
+-		s[i++] = n % 10 + '0';
+-	} while ((n /= 10) > 0);
+-	if (sign < 0)
+-		s[i++] = '-';
+-		s[i] = '\0';
+-		reverse_string(s);
++	sprintf(s, "%d", n);
+ }
+ 
+ /* coor_t */

Modified: trunk/packages/snap/trunk/debian/patches/series
===================================================================
--- trunk/packages/snap/trunk/debian/patches/series	2016-08-24 04:38:43 UTC (rev 22705)
+++ trunk/packages/snap/trunk/debian/patches/series	2016-08-24 10:23:03 UTC (rev 22706)
@@ -2,3 +2,4 @@
 hardening.patch
 build-with-gcc-6.patch
 use-CC.patch
+replace_itoa_with_broken_indentation.patch