projects / packages / apache1.git / blame
| Commit | Line | Data |
|---|---|---|
| b65db7df ER |
1 | --- apache_1.3.41/src/support/logresolve.c~ 2009-10-30 17:25:18.000000000 +0200 |
| 2 | +++ apache_1.3.41/src/support/logresolve.c 2009-10-30 17:26:43.170695467 +0200 | |
| 3 | @@ -73,7 +73,7 @@ | |
| 4 | #include "sa_len.h" | |
| 5 | ||
| 6 | static void cgethost(struct sockaddr *sa, char *string, int check); | |
| 7 | -static int getline(char *s, int n); | |
| 8 | +static int ap_getline(char *s, int n); | |
| 9 | static void stats(FILE *output); | |
| 10 | ||
| 11 | ||
| 12 | @@ -329,7 +329,7 @@ | |
| 13 | * gets a line from stdin | |
| 14 | */ | |
| 15 | ||
| 16 | -static int getline (char *s, int n) | |
| 17 | +static int ap_getline (char *s, int n) | |
| 18 | { | |
| 19 | char *cp; | |
| 20 | ||
| 21 | @@ -378,7 +378,7 @@ | |
| 22 | for (i = 0; i < MAX_ERR + 2; i++) | |
| 23 | errors[i] = 0; | |
| 24 | ||
| 25 | - while (getline(line, MAXLINE)) { | |
| 26 | + while (ap_getline(line, MAXLINE)) { | |
| 27 | if (line[0] == '\0') | |
| 28 | continue; | |
| 29 | entries++; | |
| 30 | --- apache_1.3.41/src/support/htdigest.c~ 2009-10-30 17:25:18.000000000 +0200 | |
| 31 | +++ apache_1.3.41/src/support/htdigest.c 2009-10-30 17:26:59.554860724 +0200 | |
| 32 | @@ -71,7 +71,7 @@ | |
| 33 | while ((line[y++] = line[x++])); | |
| 34 | } | |
| 35 | ||
| 36 | -static int getline(char *s, int n, FILE *f) | |
| 37 | +static int ap_getline(char *s, int n, FILE *f) | |
| 38 | { | |
| 39 | register int i = 0; | |
| 40 | ||
| 41 | @@ -159,7 +159,7 @@ | |
| 42 | { | |
| 43 | static char line[MAX_STRING_LEN]; | |
| 44 | ||
| 45 | - while (!(getline(line, MAX_STRING_LEN, source))) { | |
| 46 | + while (!(ap_getline(line, MAX_STRING_LEN, source))) { | |
| 47 | putline(target, line); | |
| 48 | } | |
| 49 | } | |
| 50 | @@ -222,7 +222,7 @@ | |
| 51 | ap_cpystrn(realm, argv[2], sizeof(realm)); | |
| 52 | ||
| 53 | found = 0; | |
| 54 | - while (!(getline(line, MAX_STRING_LEN, f))) { | |
| 55 | + while (!(ap_getline(line, MAX_STRING_LEN, f))) { | |
| 56 | if (found || (line[0] == '#') || (!line[0])) { | |
| 57 | putline(tfp, line); | |
| 58 | continue; | |
| 59 | --- apache_1.3.41/src/support/htpasswd.c~ 2009-10-30 17:25:18.000000000 +0200 | |
| 60 | +++ apache_1.3.41/src/support/htpasswd.c 2009-10-30 17:27:11.887151384 +0200 | |
| 61 | @@ -98,7 +98,7 @@ | |
| 62 | * Get a line of input from the user, not including any terminating | |
| 63 | * newline. | |
| 64 | */ | |
| 65 | -static int getline(char *s, int n, FILE *f) | |
| 66 | +static int ap_getline(char *s, int n, FILE *f) | |
| 67 | { | |
| 68 | register int i = 0; | |
| 69 | ||
| 70 | @@ -553,7 +553,7 @@ | |
| 71 | char scratch[MAX_STRING_LEN]; | |
| 72 | ||
| 73 | fpw = fopen(pwfilename, "r"); | |
| 74 | - while (! (getline(line, sizeof(line), fpw))) { | |
| 75 | + while (! (ap_getline(line, sizeof(line), fpw))) { | |
| 76 | char *colon; | |
| 77 | ||
| 78 | if ((line[0] == '#') || (line[0] == '\0')) { |