diff options
| author | Dmitry Antipov | 2012-07-16 08:47:31 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-07-16 08:47:31 +0400 |
| commit | 6a0dd1d7e075ccb23ed08afafe9b251eacd931bd (patch) | |
| tree | e67dc3032080113eb198c46b9be13b4f2a071f83 /src | |
| parent | 7a6136fd76b7eae4770bfd1cbb8812f6508d6a7f (diff) | |
| download | emacs-6a0dd1d7e075ccb23ed08afafe9b251eacd931bd.tar.gz emacs-6a0dd1d7e075ccb23ed08afafe9b251eacd931bd.zip | |
Remove empty and useless init functions.
* lisp.h (init_character_once, init_fns, init_image)
(init_filelock, init_sound): Remove prototype.
* character.c (init_character_once): Remove.
* filelock.c (init_filelock): Likewise.
* fns.c (init_fns): Likewise.
* image.c (init_image): Likewise.
* sound.c (init_sound): Likewise.
* emacs.c (main): Adjust accordingly.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 12 | ||||
| -rw-r--r-- | src/character.c | 6 | ||||
| -rw-r--r-- | src/emacs.c | 9 | ||||
| -rw-r--r-- | src/filelock.c | 9 | ||||
| -rw-r--r-- | src/fns.c | 6 | ||||
| -rw-r--r-- | src/image.c | 5 | ||||
| -rw-r--r-- | src/lisp.h | 5 | ||||
| -rw-r--r-- | src/sound.c | 6 |
8 files changed, 12 insertions, 46 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 495ffebbe63..44001546570 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,17 @@ | |||
| 1 | 2012-07-16 Dmitry Antipov <dmantipov@yandex.ru> | 1 | 2012-07-16 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 2 | ||
| 3 | Remove empty and useless init functions. | ||
| 4 | * lisp.h (init_character_once, init_fns, init_image) | ||
| 5 | (init_filelock, init_sound): Remove prototype. | ||
| 6 | * character.c (init_character_once): Remove. | ||
| 7 | * filelock.c (init_filelock): Likewise. | ||
| 8 | * fns.c (init_fns): Likewise. | ||
| 9 | * image.c (init_image): Likewise. | ||
| 10 | * sound.c (init_sound): Likewise. | ||
| 11 | * emacs.c (main): Adjust accordingly. | ||
| 12 | |||
| 13 | 2012-07-16 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 14 | |||
| 3 | * gtkutil.h: Tiny cleanups. | 15 | * gtkutil.h: Tiny cleanups. |
| 4 | (use_old_gtk_file_dialog): Remove useless declaration. | 16 | (use_old_gtk_file_dialog): Remove useless declaration. |
| 5 | (xg_uses_old_file_dialog): Add suggested const attribute. | 17 | (xg_uses_old_file_dialog): Add suggested const attribute. |
diff --git a/src/character.c b/src/character.c index 62454fe7f1c..f4c74a93d39 100644 --- a/src/character.c +++ b/src/character.c | |||
| @@ -1010,12 +1010,6 @@ character is not ASCII nor 8-bit character, an error is signaled. */) | |||
| 1010 | return make_number (c); | 1010 | return make_number (c); |
| 1011 | } | 1011 | } |
| 1012 | 1012 | ||
| 1013 | |||
| 1014 | void | ||
| 1015 | init_character_once (void) | ||
| 1016 | { | ||
| 1017 | } | ||
| 1018 | |||
| 1019 | #ifdef emacs | 1013 | #ifdef emacs |
| 1020 | 1014 | ||
| 1021 | void | 1015 | void |
diff --git a/src/emacs.c b/src/emacs.c index db01b13c32d..2893b5f205c 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -1254,7 +1254,6 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem | |||
| 1254 | init_alloc_once (); | 1254 | init_alloc_once (); |
| 1255 | init_obarray (); | 1255 | init_obarray (); |
| 1256 | init_eval_once (); | 1256 | init_eval_once (); |
| 1257 | init_character_once (); | ||
| 1258 | init_charset_once (); | 1257 | init_charset_once (); |
| 1259 | init_coding_once (); | 1258 | init_coding_once (); |
| 1260 | init_syntax_once (); /* Create standard syntax table. */ | 1259 | init_syntax_once (); /* Create standard syntax table. */ |
| @@ -1307,9 +1306,6 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem | |||
| 1307 | 1306 | ||
| 1308 | init_eval (); | 1307 | init_eval (); |
| 1309 | init_data (); | 1308 | init_data (); |
| 1310 | #ifdef CLASH_DETECTION | ||
| 1311 | init_filelock (); | ||
| 1312 | #endif | ||
| 1313 | init_atimer (); | 1309 | init_atimer (); |
| 1314 | running_asynch_code = 0; | 1310 | running_asynch_code = 0; |
| 1315 | 1311 | ||
| @@ -1602,17 +1598,12 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem | |||
| 1602 | init_keyboard (); /* This too must precede init_sys_modes. */ | 1598 | init_keyboard (); /* This too must precede init_sys_modes. */ |
| 1603 | if (!noninteractive) | 1599 | if (!noninteractive) |
| 1604 | init_display (); /* Determine terminal type. Calls init_sys_modes. */ | 1600 | init_display (); /* Determine terminal type. Calls init_sys_modes. */ |
| 1605 | init_fns (); | ||
| 1606 | init_xdisp (); | 1601 | init_xdisp (); |
| 1607 | #ifdef HAVE_WINDOW_SYSTEM | 1602 | #ifdef HAVE_WINDOW_SYSTEM |
| 1608 | init_fringe (); | 1603 | init_fringe (); |
| 1609 | init_image (); | ||
| 1610 | #endif /* HAVE_WINDOW_SYSTEM */ | 1604 | #endif /* HAVE_WINDOW_SYSTEM */ |
| 1611 | init_macros (); | 1605 | init_macros (); |
| 1612 | init_floatfns (); | 1606 | init_floatfns (); |
| 1613 | #ifdef HAVE_SOUND | ||
| 1614 | init_sound (); | ||
| 1615 | #endif | ||
| 1616 | init_window (); | 1607 | init_window (); |
| 1617 | init_font (); | 1608 | init_font (); |
| 1618 | 1609 | ||
diff --git a/src/filelock.c b/src/filelock.c index e5de7355652..e840d3c5c3b 100644 --- a/src/filelock.c +++ b/src/filelock.c | |||
| @@ -708,15 +708,6 @@ t if it is locked by you, else a string saying which user has locked it. */) | |||
| 708 | 708 | ||
| 709 | return ret; | 709 | return ret; |
| 710 | } | 710 | } |
| 711 | |||
| 712 | /* Initialization functions. */ | ||
| 713 | |||
| 714 | void | ||
| 715 | init_filelock (void) | ||
| 716 | { | ||
| 717 | boot_time = 0; | ||
| 718 | boot_time_initialized = 0; | ||
| 719 | } | ||
| 720 | 711 | ||
| 721 | #endif /* CLASH_DETECTION */ | 712 | #endif /* CLASH_DETECTION */ |
| 722 | 713 | ||
| @@ -5022,9 +5022,3 @@ this variable. */); | |||
| 5022 | defsubr (&Ssecure_hash); | 5022 | defsubr (&Ssecure_hash); |
| 5023 | defsubr (&Slocale_info); | 5023 | defsubr (&Slocale_info); |
| 5024 | } | 5024 | } |
| 5025 | |||
| 5026 | |||
| 5027 | void | ||
| 5028 | init_fns (void) | ||
| 5029 | { | ||
| 5030 | } | ||
diff --git a/src/image.c b/src/image.c index 6f2afb28cd2..8a318c2f6ec 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -8951,8 +8951,3 @@ The options are: | |||
| 8951 | #endif | 8951 | #endif |
| 8952 | 8952 | ||
| 8953 | } | 8953 | } |
| 8954 | |||
| 8955 | void | ||
| 8956 | init_image (void) | ||
| 8957 | { | ||
| 8958 | } | ||
diff --git a/src/lisp.h b/src/lisp.h index 9a277f0d2d3..09c504363fa 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -2402,7 +2402,6 @@ extern ptrdiff_t chars_in_text (const unsigned char *, ptrdiff_t); | |||
| 2402 | extern ptrdiff_t multibyte_chars_in_text (const unsigned char *, ptrdiff_t); | 2402 | extern ptrdiff_t multibyte_chars_in_text (const unsigned char *, ptrdiff_t); |
| 2403 | extern int multibyte_char_to_unibyte (int) ATTRIBUTE_CONST; | 2403 | extern int multibyte_char_to_unibyte (int) ATTRIBUTE_CONST; |
| 2404 | extern int multibyte_char_to_unibyte_safe (int) ATTRIBUTE_CONST; | 2404 | extern int multibyte_char_to_unibyte_safe (int) ATTRIBUTE_CONST; |
| 2405 | extern void init_character_once (void) ATTRIBUTE_CONST; | ||
| 2406 | extern void syms_of_character (void); | 2405 | extern void syms_of_character (void); |
| 2407 | 2406 | ||
| 2408 | /* Defined in charset.c */ | 2407 | /* Defined in charset.c */ |
| @@ -2437,7 +2436,6 @@ Lisp_Object make_hash_table (Lisp_Object, Lisp_Object, Lisp_Object, | |||
| 2437 | ptrdiff_t hash_lookup (struct Lisp_Hash_Table *, Lisp_Object, EMACS_UINT *); | 2436 | ptrdiff_t hash_lookup (struct Lisp_Hash_Table *, Lisp_Object, EMACS_UINT *); |
| 2438 | ptrdiff_t hash_put (struct Lisp_Hash_Table *, Lisp_Object, Lisp_Object, | 2437 | ptrdiff_t hash_put (struct Lisp_Hash_Table *, Lisp_Object, Lisp_Object, |
| 2439 | EMACS_UINT); | 2438 | EMACS_UINT); |
| 2440 | extern void init_fns (void) ATTRIBUTE_CONST; | ||
| 2441 | 2439 | ||
| 2442 | extern Lisp_Object substring_both (Lisp_Object, ptrdiff_t, ptrdiff_t, | 2440 | extern Lisp_Object substring_both (Lisp_Object, ptrdiff_t, ptrdiff_t, |
| 2443 | ptrdiff_t, ptrdiff_t); | 2441 | ptrdiff_t, ptrdiff_t); |
| @@ -2473,7 +2471,6 @@ extern Lisp_Object QCascent, QCmargin, QCrelief; | |||
| 2473 | extern Lisp_Object QCconversion; | 2471 | extern Lisp_Object QCconversion; |
| 2474 | extern int x_bitmap_mask (struct frame *, ptrdiff_t); | 2472 | extern int x_bitmap_mask (struct frame *, ptrdiff_t); |
| 2475 | extern void syms_of_image (void); | 2473 | extern void syms_of_image (void); |
| 2476 | extern void init_image (void) ATTRIBUTE_CONST; | ||
| 2477 | 2474 | ||
| 2478 | /* Defined in insdel.c */ | 2475 | /* Defined in insdel.c */ |
| 2479 | extern Lisp_Object Qinhibit_modification_hooks; | 2476 | extern Lisp_Object Qinhibit_modification_hooks; |
| @@ -3162,11 +3159,9 @@ extern void lock_file (Lisp_Object); | |||
| 3162 | extern void unlock_file (Lisp_Object); | 3159 | extern void unlock_file (Lisp_Object); |
| 3163 | extern void unlock_buffer (struct buffer *); | 3160 | extern void unlock_buffer (struct buffer *); |
| 3164 | extern void syms_of_filelock (void); | 3161 | extern void syms_of_filelock (void); |
| 3165 | extern void init_filelock (void); | ||
| 3166 | 3162 | ||
| 3167 | /* Defined in sound.c */ | 3163 | /* Defined in sound.c */ |
| 3168 | extern void syms_of_sound (void); | 3164 | extern void syms_of_sound (void); |
| 3169 | extern void init_sound (void) ATTRIBUTE_CONST; | ||
| 3170 | 3165 | ||
| 3171 | /* Defined in category.c */ | 3166 | /* Defined in category.c */ |
| 3172 | extern void init_category_once (void); | 3167 | extern void init_category_once (void); |
diff --git a/src/sound.c b/src/sound.c index 3773047827b..151bc1a08c1 100644 --- a/src/sound.c +++ b/src/sound.c | |||
| @@ -1473,10 +1473,4 @@ syms_of_sound (void) | |||
| 1473 | defsubr (&Splay_sound_internal); | 1473 | defsubr (&Splay_sound_internal); |
| 1474 | } | 1474 | } |
| 1475 | 1475 | ||
| 1476 | |||
| 1477 | void | ||
| 1478 | init_sound (void) | ||
| 1479 | { | ||
| 1480 | } | ||
| 1481 | |||
| 1482 | #endif /* HAVE_SOUND */ | 1476 | #endif /* HAVE_SOUND */ |