diff options
| author | Paul Eggert | 2011-03-21 09:41:03 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-03-21 09:41:03 -0700 |
| commit | 58cb46fbf4a0d3b37cb9cf2b07446eaa48663693 (patch) | |
| tree | 2c0e30593bfb49d3b3df535f4820cb42fe4cb23d | |
| parent | 3ef271f27f47dab138d431a72838d43a17102e27 (diff) | |
| download | emacs-58cb46fbf4a0d3b37cb9cf2b07446eaa48663693.tar.gz emacs-58cb46fbf4a0d3b37cb9cf2b07446eaa48663693.zip | |
* etags.c (Ada_funcs): Redo slightly to avoid overflow warning.
| -rw-r--r-- | lib-src/ChangeLog | 2 | ||||
| -rw-r--r-- | lib-src/etags.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index cb847669deb..6c25f582eea 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-03-21 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-03-21 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * etags.c (Ada_funcs): Redo slightly to avoid overflow warning. | ||
| 4 | |||
| 3 | etags: In Prolog functions, don't assume int fits in size_t. | 5 | etags: In Prolog functions, don't assume int fits in size_t. |
| 4 | This avoids a warning with gcc -Wstrict-overflow. | 6 | This avoids a warning with gcc -Wstrict-overflow. |
| 5 | * etags.c (Prolog_functions, prolog_pr, prolog_atom): Use size_t, | 7 | * etags.c (Prolog_functions, prolog_pr, prolog_atom): Use size_t, |
diff --git a/lib-src/etags.c b/lib-src/etags.c index 0c14a0d1663..6cb321fe75e 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c | |||
| @@ -4198,7 +4198,7 @@ Ada_funcs (FILE *inf) | |||
| 4198 | /* Skip a string i.e. "abcd". */ | 4198 | /* Skip a string i.e. "abcd". */ |
| 4199 | if (inquote || (*dbp == '"')) | 4199 | if (inquote || (*dbp == '"')) |
| 4200 | { | 4200 | { |
| 4201 | dbp = etags_strchr ((inquote) ? dbp : dbp+1, '"'); | 4201 | dbp = etags_strchr (dbp + !inquote, '"'); |
| 4202 | if (dbp != NULL) | 4202 | if (dbp != NULL) |
| 4203 | { | 4203 | { |
| 4204 | inquote = FALSE; | 4204 | inquote = FALSE; |