--- src/dap0.c.orig 2008-02-11 17:50:39.000000000 -0600 +++ src/dap0.c 2012-08-25 16:39:52.000000000 -0500 @@ -543,7 +543,7 @@ return -1; } -static int getline(DFILE *fp, char *line) +static int dap_getline(DFILE *fp, char *line) { int l; int c; @@ -569,7 +569,7 @@ else { line[l] = '\0'; - fprintf(dap_err, "(getline) line too long:\n%s\n", line); + fprintf(dap_err, "(dap_getline) line too long:\n%s\n", line); exit(1); } } @@ -589,7 +589,7 @@ line[l] = '\0'; break; default: - fprintf(dap_err, "(getline) bad infile type: %d\n", intype); + fprintf(dap_err, "(dap_getline) bad infile type: %d\n", intype); exit(1); } if (!l && c == EOF) @@ -773,7 +773,7 @@ dap_ono); exit(1); } - if (getline(dap_in[dap_ono], line) < 0) + if (dap_getline(dap_in[dap_ono], line) < 0) eof[dap_ono] = 1; lineno[dap_ono]++; } @@ -789,7 +789,7 @@ int l; int i; int iv; - int nread; /* number of chars read by getline */ + int nread; /* number of chars read by dap_getline */ if (!stepinit) { @@ -823,7 +823,7 @@ } } dap_prev[dap_ono].do_valid = dap_obs[dap_ono].do_valid; - if ((nread = getline(dap_in[dap_ono], line)) <= 0) + if ((nread = dap_getline(dap_in[dap_ono], line)) <= 0) { eof[dap_ono] = 1; dap_obs[dap_ono].do_valid = 0; @@ -2069,7 +2069,7 @@ } intype = DSET; dap_delim = '\0'; - if (getline(dap_in[dap_ono], varspec) < 0) + if (dap_getline(dap_in[dap_ono], varspec) < 0) { fprintf(dap_err, "(inset) data set empty: %s\n", fname); exit(1);