diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-04-30 17:17:11 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-04-30 17:17:54 -0700 |
| commit | 65ac27783a959a8339c2aab0f1e54d9b508a1f1f (patch) | |
| tree | 5bc4b320aa5cb50203a68e2c589279d8d5b8ea8f | |
| parent | 4b10800b59eadd532e74a49a35bc26e0e948b231 (diff) | |
| download | emacs-65ac27783a959a8339c2aab0f1e54d9b508a1f1f.tar.gz | |
Port --enable-gcc-warnings to GCC 8
Backport from master.
* lib-src/emacsclient.c (fail):
Do not dereference a null pointer.
* src/frame.c (delete_frame):
Add a decl with UNINIT to work around GCC bug 85563.
* src/menu.h (finish_menu_items):
Do not use attribute const.
* src/regex.c (analyze_first): Use FALLTHROUGH, not a comment.
| -rw-r--r-- | lib-src/emacsclient.c | 2 | ||||
| -rw-r--r-- | src/frame.c | 1 | ||||
| -rw-r--r-- | src/menu.h | 2 | ||||
| -rw-r--r-- | src/regex.c | 3 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 574bec850fa..b139b2fe3f6 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -700,7 +700,7 @@ fail (void) { size_t extra_args_size = (main_argc - optind + 1) * sizeof (char *); size_t new_argv_size = extra_args_size; - char **new_argv = NULL; + char **new_argv = xmalloc (new_argv_size); char *s = xstrdup (alternate_editor); unsigned toks = 0; diff --git a/src/frame.c b/src/frame.c index cee775c6fa9..0a6ca26f5d7 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1933,6 +1933,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force) if (f == sf) { Lisp_Object tail; + Lisp_Object frame1 UNINIT; /* This line works around GCC bug 85563. */ eassume (CONSP (Vframe_list)); /* Look for another visible frame on the same terminal. diff --git a/src/menu.h b/src/menu.h index 4c4ac83424f..1aa53f74544 100644 --- a/src/menu.h +++ b/src/menu.h @@ -30,7 +30,7 @@ enum { }; extern void init_menu_items (void); -extern void finish_menu_items (void) ATTRIBUTE_CONST; +extern void finish_menu_items (void); extern void discard_menu_items (void); extern void save_menu_items (void); extern bool parse_single_submenu (Lisp_Object, Lisp_Object, Lisp_Object); diff --git a/src/regex.c b/src/regex.c index e8b99f6f023..4f9df68a9fe 100644 --- a/src/regex.c +++ b/src/regex.c @@ -4038,8 +4038,7 @@ analyze_first (const_re_char *p, const_re_char *pend, char *fastmap, }; /* Keep `p1' to allow the `on_failure_jump' we are jumping to to jump back to "just after here". */ - /* Fallthrough */ - + FALLTHROUGH; case on_failure_jump: case on_failure_keep_string_jump: case on_failure_jump_nastyloop: |