This commit was generated by cvs2svn to compensate for changes in r168463,
which included commits to RCS files with non-trunk default branches.
This commit is contained in:
commit
f907c9c5c0
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $P4: //depot/projects/openpam/lib/openpam_readline.c#3 $
|
||||
* $Id: openpam_readline.c 380 2006-03-14 14:42:09Z des $
|
||||
*/
|
||||
|
||||
#include <ctype.h>
|
||||
@ -52,7 +52,7 @@
|
||||
char *
|
||||
openpam_readline(FILE *f, int *lineno, size_t *lenp)
|
||||
{
|
||||
unsigned char *line;
|
||||
char *line;
|
||||
size_t len, size;
|
||||
int ch;
|
||||
|
||||
@ -63,7 +63,7 @@ openpam_readline(FILE *f, int *lineno, size_t *lenp)
|
||||
|
||||
#define line_putch(ch) do { \
|
||||
if (len >= size - 1) { \
|
||||
unsigned char *tmp = realloc(line, size *= 2); \
|
||||
char *tmp = realloc(line, size *= 2); \
|
||||
if (tmp == NULL) \
|
||||
goto fail; \
|
||||
line = tmp; \
|
||||
@ -83,7 +83,7 @@ openpam_readline(FILE *f, int *lineno, size_t *lenp)
|
||||
/* eof */
|
||||
if (ch == EOF) {
|
||||
/* remove trailing whitespace */
|
||||
while (len > 0 && isspace(line[len - 1]))
|
||||
while (len > 0 && isspace((int)line[len - 1]))
|
||||
--len;
|
||||
line[len] = '\0';
|
||||
if (len == 0)
|
||||
@ -96,7 +96,7 @@ openpam_readline(FILE *f, int *lineno, size_t *lenp)
|
||||
++*lineno;
|
||||
|
||||
/* remove trailing whitespace */
|
||||
while (len > 0 && isspace(line[len - 1]))
|
||||
while (len > 0 && isspace((int)line[len - 1]))
|
||||
--len;
|
||||
line[len] = '\0';
|
||||
/* skip blank lines */
|
||||
|
Loading…
x
Reference in New Issue
Block a user