← Back to branch summary

~ubuntu-branches/ubuntu/raring/hplip/raring-proposed

« back to all changes in this revision

Viewing changes to scan/sane/http.c

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-05-26 11:20:39 UTC
  • mfrom: (1.5.6) (31.1.3 precise)
  • Revision ID: package-import@ubuntu.com-20120526112039-bevxczegxnbyr5m7
Tags: 3.12.4-1
http://bugs.debian.org/667828
http://bugs.debian.org/583273
http://bugs.debian.org/666544
* New upstream release
* Switch to source/format 3.0 (quilt) - drop dpatch
* Refreshed debian/patches
* dh_autoreconf debian/autogen.sh & set local-options single-debian-patch
* Update to debian/compat -> 9
* Fix "hardened build flags" patch from Moritz - thanks (Closes: #667828)
* Fix "duplex descriptor uninitialized" patch from Matej (Closes: #583273)
* Fix "please migrate to kde-runtime" patch from Pino (Closes: #666544)

Show diffs side-by-side

added added

removed removed

Lines of Context:
scan/sane/http.c
338
338
   if (read_line(ps, data, max_size, tmo, &len))
339
339
      goto bugout;
340
340
   ps->http_status = strtol(data+9, NULL, 10);
 
341
   *bytes_read = total = len;
341
342
 
342
343
   /* Check for good status, ignore 400 (no job id found for JobCancelRequest) */                    
343
344
   if (!((ps->http_status >= 200 && ps->http_status < 300) || ps->http_status == 400))
472
473
                     strcpy(data, line);
473
474
                     data=data+len;
474
475
                     ps->footer -= len;
 
476
            *bytes_read += len;
475
477
         }
476
478
      } 
477
479
      else