[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-24-ga76e3ea

[Steffen Moeller]

The following commit has been merged in the master branch:
commit a76e3eadcca4cf70fab283c61f2d799e5ceb78cf
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Sun Aug 26 19:17:36 2012 +0200

    Fixing indenting and missing return in patch

diff --git a/debian/patches/ignored_return_value.patch b/debian/patches/ignored_return_value.patch
index 9ef18bb..aa76b01 100644
--- a/debian/patches/ignored_return_value.patch
+++ b/debian/patches/ignored_return_value.patch
@@ -1,8 +1,8 @@
 Index: boinc/api/gutil.cpp
 ===================================================================
---- boinc.orig/api/gutil.cpp	2012-08-25 22:40:35.667549542 +0200
-+++ boinc/api/gutil.cpp	2012-08-26 17:10:51.276213384 +0200
-@@ -553,32 +553,61 @@
+--- boinc.orig/api/gutil.cpp	2012-08-26 19:16:06.793748659 +0200
++++ boinc/api/gutil.cpp	2012-08-26 19:17:25.488681284 +0200
+@@ -553,32 +553,62 @@
  //
  int read_ppm_file(const char* name, int& w, int& h, unsigned char** arrayp) {
      FILE* f;
@@ -34,12 +34,12 @@ Index: boinc/api/gutil.cpp
 +    int bs = sscanf(buf, "%d %d", &w, &h);
 +    if (bs < 2) {
 +        fclose(f);
-+	fprintf(stderr,"E read_ppm_file: read only %d of w and h in %s",bs,name);
++        fprintf(stderr,"E read_ppm_file: read only %d of w and h in %s",bs,name);
 +        return -1;
 +    }
 +    if (w<0 || h<0) {
 +        fclose(f);
-+	fprintf(stderr,"E read_ppm_file: w=%d<0 or h=%d<0\n",w,h);
++        fprintf(stderr,"E read_ppm_file: w=%d<0 or h=%d<0\n",w,h);
 +        return -1;
 +    }
 +    do {s=fgets(buf, sizeof(buf), f);} while (NULL != s && buf[0] == '#');
@@ -57,7 +57,8 @@ Index: boinc/api/gutil.cpp
 +            int fs=fscanf(f, "%d", &x);
 +	    if (1 != fs) {
 +	        fclose(f);
-+	        fprintf(stderr,"E: expected scanf of 1 object, but read %d of file '%s'.\n", fs, name);
++                fprintf(stderr,"E: expected scanf of 1 object, but read %d of file '%s'.\n", fs, name);
++		return -1;
 +	    }
              array[i] = x;
          }
@@ -66,7 +67,7 @@ Index: boinc/api/gutil.cpp
 +        size_t fr=fread(array, 3, w*h, f);
 +	if (fr < abs(w*h)) {
 +            fclose(f);
-+	    fprintf(stderr,"E: read %ld items in file '%s' but expected %d*%d=%d.\n", fr, name, w, h, w*h);
++            fprintf(stderr,"E: read %ld items in file '%s' but expected %d*%d=%d.\n", fr, name, w, h, w*h);
 +	    return -1;
 +	}
          break;

-- 
BOINC packaging