- Make it buildable in FreeBSD-12.

iXsystems · Jun 9, 2017 · 9e2eacf · 9e2eacf
1 parent 44fc0a0
commit 9e2eacf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/include/ndmpd.h b/include/ndmpd.h
@@ -47,6 +47,7 @@
 #include <sys/socket.h>
 #include <string.h> /* memset */
 #include <unistd.h> /* close */
+#include <stdio.h>
 
 /* free() */
 #include <stdlib.h>
@@ -318,5 +319,6 @@ int ndmp_run(u_long port, ndmp_con_handler_func_t con_handler_func);
 void connection_handler(ndmp_connection_t *connection);
 bool_t file_exists(const char * filename);
 int startNDMPD(void);
+static char * getline_ndmpd(FILE *fp, char *line, int llen);
 
 #endif /* _NDMPD_H_ */
diff --git a/src/ndmpd_dtime.c b/src/ndmpd_dtime.c
@@ -274,12 +274,12 @@ ddates_pathname(char *buf)
 }
 
 /*
- * getline
+ * getline_ndmpd
  *
  * Get a line from the file and handle the continued lines.
  */
 static char *
-getline(FILE *fp, char *line, int llen)
+getline_ndmpd(FILE *fp, char *line, int llen)
 {
 	char *save;
 	int len;
@@ -563,7 +563,7 @@ getrecord(FILE *fp, dumpdates_t *ddatep, int *recno)
 		return (-1);
 
 	do {
-		if (getline(fp, tbuf, sizeof (tbuf)) != tbuf)
+		if (getline_ndmpd(fp, tbuf, sizeof (tbuf)) != tbuf)
 			return (-1);
 	} while (!*tbuf);