diff options
| author | Karl Heuer | 1996-01-20 20:51:31 +0000 |
|---|---|---|
| committer | Karl Heuer | 1996-01-20 20:51:31 +0000 |
| commit | 7d6659459e84fb673beaba4dc727f81a409203b5 (patch) | |
| tree | a9a67dbfb9921945104b3328cec55e5beb8e25c1 /lib-src | |
| parent | d28acb97e3e2de250373f61296ddd770bf29c128 (diff) | |
| download | emacs-7d6659459e84fb673beaba4dc727f81a409203b5.tar.gz emacs-7d6659459e84fb673beaba4dc727f81a409203b5.zip | |
(pop_retrieve, getline): Avoid type clashes.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/pop.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib-src/pop.c b/lib-src/pop.c index 0a57f578b46..77d7595801b 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c | |||
| @@ -76,6 +76,7 @@ extern char *getenv (/* char * */); | |||
| 76 | extern char *getlogin (/* void */); | 76 | extern char *getlogin (/* void */); |
| 77 | extern char *getpass (/* char * */); | 77 | extern char *getpass (/* char * */); |
| 78 | extern char *strerror (/* int */); | 78 | extern char *strerror (/* int */); |
| 79 | extern char *index (); | ||
| 79 | 80 | ||
| 80 | #ifdef KERBEROS | 81 | #ifdef KERBEROS |
| 81 | #ifndef KRB5 | 82 | #ifndef KRB5 |
| @@ -560,7 +561,7 @@ pop_retrieve (server, message, markfrom) | |||
| 560 | * allocate more space for them below. | 561 | * allocate more space for them below. |
| 561 | */ | 562 | */ |
| 562 | bufsize = sizes[0] + (markfrom ? 5 : 0); | 563 | bufsize = sizes[0] + (markfrom ? 5 : 0); |
| 563 | ptr = malloc (bufsize); | 564 | ptr = (char *)malloc (bufsize); |
| 564 | free ((char *) IDs); | 565 | free ((char *) IDs); |
| 565 | free ((char *) sizes); | 566 | free ((char *) sizes); |
| 566 | 567 | ||
| @@ -587,7 +588,7 @@ pop_retrieve (server, message, markfrom) | |||
| 587 | if (++fromcount == 5) | 588 | if (++fromcount == 5) |
| 588 | { | 589 | { |
| 589 | bufsize += 5; | 590 | bufsize += 5; |
| 590 | ptr = realloc (ptr, bufsize); | 591 | ptr = (char *)realloc (ptr, bufsize); |
| 591 | if (! ptr) | 592 | if (! ptr) |
| 592 | { | 593 | { |
| 593 | strcpy (pop_error, "Out of memory in pop_retrieve"); | 594 | strcpy (pop_error, "Out of memory in pop_retrieve"); |
| @@ -1234,7 +1235,7 @@ getline (server) | |||
| 1234 | if (server->data == server->buffer_size - 1) | 1235 | if (server->data == server->buffer_size - 1) |
| 1235 | { | 1236 | { |
| 1236 | server->buffer_size += GETLINE_INCR; | 1237 | server->buffer_size += GETLINE_INCR; |
| 1237 | server->buffer = realloc (server->buffer, server->buffer_size); | 1238 | server->buffer = (char *)realloc (server->buffer, server->buffer_size); |
| 1238 | if (! server->buffer) | 1239 | if (! server->buffer) |
| 1239 | { | 1240 | { |
| 1240 | strcpy (pop_error, "Out of memory in getline"); | 1241 | strcpy (pop_error, "Out of memory in getline"); |