diff options
| author | Stefan Monnier | 2010-09-13 16:40:48 +0200 |
|---|---|---|
| committer | Stefan Monnier | 2010-09-13 16:40:48 +0200 |
| commit | cc390e46c7ba95b76ea133d98fd386214cd01709 (patch) | |
| tree | ead4400d22bd07214b782ff7e46e79d473fac419 /lib-src/sorted-doc.c | |
| parent | c566235d981eba73c88bbff00b6a1d88360b6e9f (diff) | |
| parent | c5fe4acb5fb456d6e8e147d8bc7981ce56c5c03d (diff) | |
| download | emacs-cc390e46c7ba95b76ea133d98fd386214cd01709.tar.gz emacs-cc390e46c7ba95b76ea133d98fd386214cd01709.zip | |
Merge from trunk
Diffstat (limited to 'lib-src/sorted-doc.c')
| -rw-r--r-- | lib-src/sorted-doc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c index 595633b76d8..db3f3029532 100644 --- a/lib-src/sorted-doc.c +++ b/lib-src/sorted-doc.c | |||
| @@ -65,7 +65,7 @@ struct docstr /* Allocated thing for an entry. */ | |||
| 65 | /* Print error message. `s1' is printf control string, `s2' is arg for it. */ | 65 | /* Print error message. `s1' is printf control string, `s2' is arg for it. */ |
| 66 | 66 | ||
| 67 | void | 67 | void |
| 68 | error (char *s1, char *s2) | 68 | error (const char *s1, const char *s2) |
| 69 | { | 69 | { |
| 70 | fprintf (stderr, "sorted-doc: "); | 70 | fprintf (stderr, "sorted-doc: "); |
| 71 | fprintf (stderr, s1, s2); | 71 | fprintf (stderr, s1, s2); |
| @@ -75,7 +75,7 @@ error (char *s1, char *s2) | |||
| 75 | /* Print error message and exit. */ | 75 | /* Print error message and exit. */ |
| 76 | 76 | ||
| 77 | void | 77 | void |
| 78 | fatal (char *s1, char *s2) | 78 | fatal (const char *s1, const char *s2) |
| 79 | { | 79 | { |
| 80 | error (s1, s2); | 80 | error (s1, s2); |
| 81 | exit (EXIT_FAILURE); | 81 | exit (EXIT_FAILURE); |
| @@ -117,7 +117,7 @@ enum state | |||
| 117 | WAITING, BEG_NAME, NAME_GET, BEG_DESC, DESC_GET | 117 | WAITING, BEG_NAME, NAME_GET, BEG_DESC, DESC_GET |
| 118 | }; | 118 | }; |
| 119 | 119 | ||
| 120 | char *states[] = | 120 | const char *states[] = |
| 121 | { | 121 | { |
| 122 | "WAITING", "BEG_NAME", "NAME_GET", "BEG_DESC", "DESC_GET" | 122 | "WAITING", "BEG_NAME", "NAME_GET", "BEG_DESC", "DESC_GET" |
| 123 | }; | 123 | }; |