diff options
| author | Mattias EngdegÄrd | 2021-06-16 18:05:41 +0200 |
|---|---|---|
| committer | Mattias EngdegÄrd | 2021-06-16 18:05:41 +0200 |
| commit | 7c22aa36cd622ba2a9176e319ce5fb2b06f87801 (patch) | |
| tree | 2e1e577375205d1175e509bb9910893b01f01a4b /src | |
| parent | 1f4e919cb2fc81976346aacbef4126753c423724 (diff) | |
| download | emacs-7c22aa36cd622ba2a9176e319ce5fb2b06f87801.tar.gz emacs-7c22aa36cd622ba2a9176e319ce5fb2b06f87801.zip | |
Eliminate some GCC warnings
* src/doprnt.c (exprintf, evxprintf):
* src/lisp.h (exprintf, evxprintf): Don't use a pointer-to-const type
for the `nonheapbuf` argument: although it is never dereferenced, GCC
will warn when passing a pointer to uninitialised memory otherwise.
* src/fns.c (sort_vector_copy, realize_face, realize_gui_face)
(realize_tty_face): Use the same signatures in the prototypes as in
the actual function definitions.
Diffstat (limited to 'src')
| -rw-r--r-- | src/doprnt.c | 4 | ||||
| -rw-r--r-- | src/fns.c | 5 | ||||
| -rw-r--r-- | src/lisp.h | 4 | ||||
| -rw-r--r-- | src/xfaces.c | 9 |
4 files changed, 13 insertions, 9 deletions
diff --git a/src/doprnt.c b/src/doprnt.c index b6b5978c891..fe484b8e766 100644 --- a/src/doprnt.c +++ b/src/doprnt.c | |||
| @@ -563,7 +563,7 @@ esprintf (char *buf, char const *format, ...) | |||
| 563 | BUFSIZE_MAX. */ | 563 | BUFSIZE_MAX. */ |
| 564 | ptrdiff_t | 564 | ptrdiff_t |
| 565 | exprintf (char **buf, ptrdiff_t *bufsize, | 565 | exprintf (char **buf, ptrdiff_t *bufsize, |
| 566 | char const *nonheapbuf, ptrdiff_t bufsize_max, | 566 | char *nonheapbuf, ptrdiff_t bufsize_max, |
| 567 | char const *format, ...) | 567 | char const *format, ...) |
| 568 | { | 568 | { |
| 569 | ptrdiff_t nbytes; | 569 | ptrdiff_t nbytes; |
| @@ -579,7 +579,7 @@ exprintf (char **buf, ptrdiff_t *bufsize, | |||
| 579 | /* Act like exprintf, except take a va_list. */ | 579 | /* Act like exprintf, except take a va_list. */ |
| 580 | ptrdiff_t | 580 | ptrdiff_t |
| 581 | evxprintf (char **buf, ptrdiff_t *bufsize, | 581 | evxprintf (char **buf, ptrdiff_t *bufsize, |
| 582 | char const *nonheapbuf, ptrdiff_t bufsize_max, | 582 | char *nonheapbuf, ptrdiff_t bufsize_max, |
| 583 | char const *format, va_list ap) | 583 | char const *format, va_list ap) |
| 584 | { | 584 | { |
| 585 | for (;;) | 585 | for (;;) |
| @@ -39,8 +39,9 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ | |||
| 39 | #include "puresize.h" | 39 | #include "puresize.h" |
| 40 | #include "gnutls.h" | 40 | #include "gnutls.h" |
| 41 | 41 | ||
| 42 | static void sort_vector_copy (Lisp_Object, ptrdiff_t, | 42 | static void sort_vector_copy (Lisp_Object pred, ptrdiff_t len, |
| 43 | Lisp_Object *restrict, Lisp_Object *restrict); | 43 | Lisp_Object src[restrict VLA_ELEMS (len)], |
| 44 | Lisp_Object dest[restrict VLA_ELEMS (len)]); | ||
| 44 | enum equal_kind { EQUAL_NO_QUIT, EQUAL_PLAIN, EQUAL_INCLUDING_PROPERTIES }; | 45 | enum equal_kind { EQUAL_NO_QUIT, EQUAL_PLAIN, EQUAL_INCLUDING_PROPERTIES }; |
| 45 | static bool internal_equal (Lisp_Object, Lisp_Object, | 46 | static bool internal_equal (Lisp_Object, Lisp_Object, |
| 46 | enum equal_kind, int, Lisp_Object); | 47 | enum equal_kind, int, Lisp_Object); |
diff --git a/src/lisp.h b/src/lisp.h index 91b7a89d0f5..4fb89236788 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -4064,10 +4064,10 @@ extern ptrdiff_t doprnt (char *, ptrdiff_t, const char *, const char *, | |||
| 4064 | va_list); | 4064 | va_list); |
| 4065 | extern ptrdiff_t esprintf (char *, char const *, ...) | 4065 | extern ptrdiff_t esprintf (char *, char const *, ...) |
| 4066 | ATTRIBUTE_FORMAT_PRINTF (2, 3); | 4066 | ATTRIBUTE_FORMAT_PRINTF (2, 3); |
| 4067 | extern ptrdiff_t exprintf (char **, ptrdiff_t *, char const *, ptrdiff_t, | 4067 | extern ptrdiff_t exprintf (char **, ptrdiff_t *, char *, ptrdiff_t, |
| 4068 | char const *, ...) | 4068 | char const *, ...) |
| 4069 | ATTRIBUTE_FORMAT_PRINTF (5, 6); | 4069 | ATTRIBUTE_FORMAT_PRINTF (5, 6); |
| 4070 | extern ptrdiff_t evxprintf (char **, ptrdiff_t *, char const *, ptrdiff_t, | 4070 | extern ptrdiff_t evxprintf (char **, ptrdiff_t *, char *, ptrdiff_t, |
| 4071 | char const *, va_list) | 4071 | char const *, va_list) |
| 4072 | ATTRIBUTE_FORMAT_PRINTF (5, 0); | 4072 | ATTRIBUTE_FORMAT_PRINTF (5, 0); |
| 4073 | 4073 | ||
diff --git a/src/xfaces.c b/src/xfaces.c index ab4440f46ad..fed7b3336a2 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -353,10 +353,13 @@ static bool menu_face_changed_default; | |||
| 353 | 353 | ||
| 354 | struct named_merge_point; | 354 | struct named_merge_point; |
| 355 | 355 | ||
| 356 | static struct face *realize_face (struct face_cache *, Lisp_Object *, | 356 | static struct face *realize_face (struct face_cache *, |
| 357 | Lisp_Object [LFACE_VECTOR_SIZE], | ||
| 357 | int); | 358 | int); |
| 358 | static struct face *realize_gui_face (struct face_cache *, Lisp_Object *); | 359 | static struct face *realize_gui_face (struct face_cache *, |
| 359 | static struct face *realize_tty_face (struct face_cache *, Lisp_Object *); | 360 | Lisp_Object [LFACE_VECTOR_SIZE]); |
| 361 | static struct face *realize_tty_face (struct face_cache *, | ||
| 362 | Lisp_Object [LFACE_VECTOR_SIZE]); | ||
| 360 | static bool realize_basic_faces (struct frame *); | 363 | static bool realize_basic_faces (struct frame *); |
| 361 | static bool realize_default_face (struct frame *); | 364 | static bool realize_default_face (struct frame *); |
| 362 | static void realize_named_face (struct frame *, Lisp_Object, int); | 365 | static void realize_named_face (struct frame *, Lisp_Object, int); |