diff options
| author | George Matsumura <gmmatsumura01@bvsd.org> | 2020-08-31 22:14:59 -0600 |
|---|---|---|
| committer | George Matsumura <gmmatsumura01@bvsd.org> | 2020-11-07 06:45:01 -0700 |
| commit | ed98414686ede45a4f2302b4521dece51acdb785 (patch) | |
| tree | 578ed64ae1ab3538a3cb5130587075e81f9acc49 /util | |
| parent | 618b13c436636149bb1c611a9f4a422f60c6476d (diff) | |
| download | cairo-ed98414686ede45a4f2302b4521dece51acdb785.tar.gz | |
build: Fix various compiler warnings
This fixes a few compiler warnings that were encountered with gcc 9.3.0.
Signed-off-by: George Matsumura <gmmatsumura01@bvsd.org>
Diffstat (limited to 'util')
| -rw-r--r-- | util/cairo-script/cairo-script-file.c | 1 | ||||
| -rw-r--r-- | util/cairo-script/cairo-script-operators.c | 1 | ||||
| -rw-r--r-- | util/cairo-script/cairo-script-scanner.c | 1 | ||||
| -rw-r--r-- | util/cairo-trace/trace.c | 10 |
4 files changed, 10 insertions, 3 deletions
diff --git a/util/cairo-script/cairo-script-file.c b/util/cairo-script/cairo-script-file.c index e7c5376bf..7027f6027 100644 --- a/util/cairo-script/cairo-script-file.c +++ b/util/cairo-script/cairo-script-file.c @@ -833,6 +833,7 @@ csi_file_getc (csi_file_t *file) file->rem--; } else { file->rem = fread (file->bp = file->data, 1, CHUNK_SIZE, file->src); + /* fall through */ case BYTES: if (_csi_likely (file->rem)) { c = *file->bp++; diff --git a/util/cairo-script/cairo-script-operators.c b/util/cairo-script/cairo-script-operators.c index 7cdb5afb6..df8886ef6 100644 --- a/util/cairo-script/cairo-script-operators.c +++ b/util/cairo-script/cairo-script-operators.c @@ -465,6 +465,7 @@ _csi_ostack_get_matrix (csi_t *ctx, unsigned int i, cairo_matrix_t *out) csi_number_get_value (&obj->datum.array->stack.objects[5])); return CSI_STATUS_SUCCESS; } + /* else fall through */ default: return _csi_error (CSI_STATUS_INVALID_SCRIPT); } diff --git a/util/cairo-script/cairo-script-scanner.c b/util/cairo-script/cairo-script-scanner.c index 3dfb3a9a2..fe6512dd9 100644 --- a/util/cairo-script/cairo-script-scanner.c +++ b/util/cairo-script/cairo-script-scanner.c @@ -1054,6 +1054,7 @@ scan_token: switch (c) { case 0xa: scan->line_number++; + /* fall through */ case 0x0: case 0x9: case 0xc: diff --git a/util/cairo-trace/trace.c b/util/cairo-trace/trace.c index bb618b5d9..84952a365 100644 --- a/util/cairo-trace/trace.c +++ b/util/cairo-trace/trace.c @@ -784,7 +784,7 @@ static cairo_bool_t _init_logfile (void) { static cairo_bool_t initialized; - char buf[4105]; + char buf[4096]; const char *filename; const char *env; @@ -836,8 +836,12 @@ _init_logfile (void) if (*name == '\0') strcpy (name, "cairo-trace.dat"); - snprintf (buf, sizeof (buf), "%s/%s.%d.trace", - filename, name, getpid()); + if (snprintf (buf, sizeof (buf), "%s/%s.%d.trace", + filename, name, getpid()) >= (int) sizeof (buf)) + { + fprintf (stderr, "cairo-trace: Trace file name too long\n"); + return FALSE; + } filename = buf; } else { |