← Back to branch summary

~ubuntu-branches/ubuntu/saucy/argyll/saucy

« back to all changes in this revision

Viewing changes to cgats/pars.c

  • Committer: Package Import Robot
  • Author(s): Christian Marillat
  • Date: 2012-04-25 07:46:07 UTC
  • mfrom: (1.2.2) (13.1.15 sid)
  • Revision ID: package-import@ubuntu.com-20120425074607-yjqadetw8kum9skc
Tags: 1.4.0-4
http://bugs.debian.org/670329
Should Build-Depends on libusb-dev (Closes: #670329).

Show diffs side-by-side

added added

removed removed

Lines of Context:
cgats/pars.c
109
109
 
110
110
/* a * b */
111
111
static size_t ssat_mul(size_t a, size_t b) {
112
 
        size_t c;
113
112
 
114
113
        if (a == 0 || b == 0)
115
114
                return 0;
156
155
        size_t len;
157
156
 
158
157
        len = ssat_mul(size, count);
159
 
        if (len > (p->end - p->cur)) { /* Too much */
 
158
        if (len > (size_t)(p->end - p->cur)) { /* Too much */
160
159
                if (size > 0)
161
160
                        count = (p->end - p->cur)/size;
162
161
                else
196
195
        size_t len;
197
196
 
198
197
        len = ssat_mul(size, count);
199
 
        if (len > (p->end - p->cur)) { /* Too much */
 
198
        if (len > (size_t)(p->end - p->cur)) { /* Too much */
200
199
                if (size > 0)
201
200
                        count = (p->end - p->cur)/size;
202
201
                else
243
242
static char *cgatsFileMem_fname(
244
243
cgatsFile *pp
245
244
) {
246
 
        cgatsFileMem *p = (cgatsFileMem *)pp;
 
245
//      cgatsFileMem *p = (cgatsFileMem *)pp;
247
246
 
248
247
        /* Memory doesn't have a name */
249
248
        return "**Mem**";
334
333
/* and the error message in parse will be valid. */
335
334
static int
336
335
read_line(parse *p) {
337
 
        int c;
 
336
        char c;
338
337
        p->bo = 0;                      /* Reset pointer to the start of the line buffer */
339
338
        p->q = 0;                       /* Reset quoted flag */
340
339
        p->errc = 0;            /* Reset error status */
444
443
get_token(parse *p) {
445
444
        int tbo = 0;    /* Token buffer offset */
446
445
        int term = 0;   /* flag to trigger token termination */
447
 
        int c;
 
446
        char c;
448
447
 
449
448
        p->errc = 0;            /* Reset error status */
450
449
        p->err[0] = '\000';