diff options
| author | Michaël Cadilhac | 2007-09-19 10:02:43 +0000 |
|---|---|---|
| committer | Michaël Cadilhac | 2007-09-19 10:02:43 +0000 |
| commit | ba1cbad78960f89c6a4f680a51d502cfa0c83a59 (patch) | |
| tree | a6150fbce1d2eed8f57a06129ef70bfe08d77174 /src | |
| parent | 44342f4b79c25418b9ca4dd4196353db7b825750 (diff) | |
| download | emacs-ba1cbad78960f89c6a4f680a51d502cfa0c83a59.tar.gz emacs-ba1cbad78960f89c6a4f680a51d502cfa0c83a59.zip | |
(detect_eol_type, detect_eol_type_in_2_octet_form):
Fix a C warning regarding variable constness.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/coding.c | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c1e0f990e04..323c557f469 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2007-09-19 Micha,Ak(Bl Cadilhac <michael@cadilhac.name> | ||
| 2 | |||
| 3 | * coding.c (detect_eol_type, detect_eol_type_in_2_octet_form): | ||
| 4 | Fix a C warning regarding variable constness. | ||
| 5 | |||
| 6 | * xterm.c (handle_one_xevent): Fix a C warning. | ||
| 7 | |||
| 1 | 2007-09-18 Jason Rumney <jasonr@gnu.org> | 8 | 2007-09-18 Jason Rumney <jasonr@gnu.org> |
| 2 | 9 | ||
| 3 | * w32fns.c (Fx_focus_frame): Rename from Fw32_focus_frame. | 10 | * w32fns.c (Fx_focus_frame): Rename from Fw32_focus_frame. |
diff --git a/src/coding.c b/src/coding.c index e2ce0c9f8de..b6299097d55 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -4335,10 +4335,10 @@ detect_coding (coding, src, src_bytes) | |||
| 4335 | 4335 | ||
| 4336 | static int | 4336 | static int |
| 4337 | detect_eol_type (source, src_bytes, skip) | 4337 | detect_eol_type (source, src_bytes, skip) |
| 4338 | unsigned char *source; | 4338 | const unsigned char *source; |
| 4339 | int src_bytes, *skip; | 4339 | int src_bytes, *skip; |
| 4340 | { | 4340 | { |
| 4341 | unsigned char *src = source, *src_end = src + src_bytes; | 4341 | const unsigned char *src = source, *src_end = src + src_bytes; |
| 4342 | unsigned char c; | 4342 | unsigned char c; |
| 4343 | int total = 0; /* How many end-of-lines are found so far. */ | 4343 | int total = 0; /* How many end-of-lines are found so far. */ |
| 4344 | int eol_type = CODING_EOL_UNDECIDED; | 4344 | int eol_type = CODING_EOL_UNDECIDED; |
| @@ -4384,10 +4384,10 @@ detect_eol_type (source, src_bytes, skip) | |||
| 4384 | 4384 | ||
| 4385 | static int | 4385 | static int |
| 4386 | detect_eol_type_in_2_octet_form (source, src_bytes, skip, big_endian_p) | 4386 | detect_eol_type_in_2_octet_form (source, src_bytes, skip, big_endian_p) |
| 4387 | unsigned char *source; | 4387 | const unsigned char *source; |
| 4388 | int src_bytes, *skip, big_endian_p; | 4388 | int src_bytes, *skip, big_endian_p; |
| 4389 | { | 4389 | { |
| 4390 | unsigned char *src = source, *src_end = src + src_bytes; | 4390 | const unsigned char *src = source, *src_end = src + src_bytes; |
| 4391 | unsigned int c1, c2; | 4391 | unsigned int c1, c2; |
| 4392 | int total = 0; /* How many end-of-lines are found so far. */ | 4392 | int total = 0; /* How many end-of-lines are found so far. */ |
| 4393 | int eol_type = CODING_EOL_UNDECIDED; | 4393 | int eol_type = CODING_EOL_UNDECIDED; |