r13227 - in software/ui: debian/patches src

[Petter Reinholdtsen]

Author: pere
Date: 2012-02-12 05:15:53 +0000 (Sun, 12 Feb 2012)
New Revision: 13227

Removed:
   software/ui/debian/patches/strtol-warnings.patch
Modified:
   software/ui/debian/patches/series
   software/ui/src/pkgbrowser.cpp
Log:
Apply strtol-warnings.patch.

Modified: software/ui/debian/patches/series
===================================================================
--- software/ui/debian/patches/series	2012-02-12 05:15:01 UTC (rev 13226)
+++ software/ui/debian/patches/series	2012-02-12 05:15:53 UTC (rev 13227)
@@ -1,3 +1,2 @@
-strtol-warnings.patch
 clicktorun.patch
 generated.patch

Deleted: software/ui/debian/patches/strtol-warnings.patch
===================================================================
--- software/ui/debian/patches/strtol-warnings.patch	2012-02-12 05:15:01 UTC (rev 13226)
+++ software/ui/debian/patches/strtol-warnings.patch	2012-02-12 05:15:53 UTC (rev 13227)
@@ -1,52 +0,0 @@
-Description: 
-   * src/pkgbrowser.cpp: Assign the return value from strtol() to an
-     unused variable and mark it as unused to avoid compiler warnings
-     (Closes: #659100).  Patch from Michael Vogt and Ubuntu.
-Author: Michael Vogt
-Bug-Debian: http://bugs.debian.org/659100
-Forwarded: no
-Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
-Last-Update: 2012-02-11
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- goplay-0.4.orig/src/pkgbrowser.cpp
-+++ goplay-0.4/src/pkgbrowser.cpp
-@@ -303,7 +304,7 @@ int PackageBrowser::item_width(void *p)
- 			case 'i': font = (Fl_Font)(font|FL_ITALIC); break;
- 			case 'f': case 't': font = FL_COURIER; break;
- 			case 'B':
--			case 'C': strtol(str, &str, 10); break;// skip a color number
-+			case 'C': {long int __attribute__((unused)) unused = strtol(str, &str, 10);} break;// skip a color number
- 			case 'F': font = (Fl_Font)strtol(str, &str, 10); break;
- 			case 'S': tsize = strtol(str, &str, 10); break;
- 			case '.': done = 1; break;
-@@ -316,7 +317,7 @@ int PackageBrowser::item_width(void *p)
- 	if (*str=='%' && '0'<=str[1] && str[1]<='9')
- 	{
- 		char *after;
--		/* int percent = */ strtol(str+1, &after, 10);
-+		/* int percent = */ long int __attribute__((unused)) unused = strtol(str+1, &after, 10);
- 		int steps = 0;
- 		unsigned int bar = 0;
- 		if (after && *after=='/')
-@@ -384,7 +385,7 @@ void PackageBrowser::item_draw(void *p,
- 						fl_rectf(x, y, w1, h);
- 					}
- 					else
--						strtol(str, &str, 10);
-+						long int __attribute__((unused)) unused = strtol(str, &str, 10);
- 					break;
- 				case 'C': lcol = (Fl_Color)strtol(str, &str, 10); break;
- 				case 'F': font = (Fl_Font)strtol(str, &str, 10); break;

Modified: software/ui/src/pkgbrowser.cpp
===================================================================
--- software/ui/src/pkgbrowser.cpp	2012-02-12 05:15:01 UTC (rev 13226)
+++ software/ui/src/pkgbrowser.cpp	2012-02-12 05:15:53 UTC (rev 13227)
@@ -303,7 +303,7 @@
 			case 'i': font = (Fl_Font)(font|FL_ITALIC); break;
 			case 'f': case 't': font = FL_COURIER; break;
 			case 'B':
-			case 'C': strtol(str, &str, 10); break;// skip a color number
+			case 'C': {long int __attribute__((unused)) unused = strtol(str, &str, 10);} break;// skip a color number
 			case 'F': font = (Fl_Font)strtol(str, &str, 10); break;
 			case 'S': tsize = strtol(str, &str, 10); break;
 			case '.': done = 1; break;
@@ -316,7 +316,7 @@
 	if (*str=='%' && '0'<=str[1] && str[1]<='9')
 	{
 		char *after;
-		/* int percent = */ strtol(str+1, &after, 10);
+		/* int percent = */ long int __attribute__((unused)) unused = strtol(str+1, &after, 10);
 		int steps = 0;
 		unsigned int bar = 0;
 		if (after && *after=='/')
@@ -384,7 +384,7 @@
 						fl_rectf(x, y, w1, h);
 					}
 					else
-						strtol(str, &str, 10);
+						long int __attribute__((unused)) unused = strtol(str, &str, 10);
 					break;
 				case 'C': lcol = (Fl_Color)strtol(str, &str, 10); break;
 				case 'F': font = (Fl_Font)strtol(str, &str, 10); break;