Commit Diff
Diff:
ac22afcb4b20110416f97749521c45391e45618d
32e5d54a062965b100ac5380f6fa51853dab4e48
Commit:
32e5d54a062965b100ac5380f6fa51853dab4e48
Tree:
0921abbf2d619219ec22b15b8c45adaa7ac26c1a
Author:
pjp <pjp@delphinusdns.org>
Committer:
pjp <pjp@delphinusdns.org>
Date:
Mon Apr 14 11:38:57 2014 UTC
Message:
* remove iop from the functiosn get_ip and get_string, this was unused.
blob - ef1aaf79971b684fa6c1d64aa1e2e279c6938d94
blob + 28acc4c749f3d5e75fc220d676f59ae67de8b4da
--- parse.y
+++ parse.y
@@ -58,7 +58,7 @@ typedef struct {
int lineno;
} YYSTYPE;
-static const char rcsid[] = "$Id: parse.y,v 1.9 2014/04/14 10:13:49 pjp Exp $";
+static const char rcsid[] = "$Id: parse.y,v 1.10 2014/04/14 11:38:57 pjp Exp $";
static int version = 0;
static int state = 0;
static uint8_t region = 0;
@@ -86,9 +86,9 @@ extern void dolog(int, char *, ...);
extern void slave_shutdown(void);
-int get_string(char *buf, int n, FILE *iop);
+int get_string(char *buf, int n);
int get_quotedstring(char *buf, int n);
-int get_ip(char *buf, int n, FILE *iop);
+int get_ip(char *buf, int n);
struct rrtab * rrlookup(struct rrtab *, char *keyword);
char * check_rr(char *, char *, int, int *);
int fill_soa(char *, char *, int, char *, char *, int, int, int, int, int);
@@ -917,7 +917,7 @@ yylex()
case STATE_IP:
if (c == ':' || isalnum(c)) {
lungetc(c);
- get_ip(buf, sizeof(buf) - 1, stdin);
+ get_ip(buf, sizeof(buf) - 1);
yylval.v.string = strdup(buf);
if (yylval.v.string == NULL) {
@@ -1029,7 +1029,7 @@ yylex()
if (isalnum(c) || c == '.' || c == ':' || c == '-' || c == '_') {
lungetc(c);
- get_string(buf, sizeof(buf) - 1, stdin);
+ get_string(buf, sizeof(buf) - 1);
if ((cp = strpbrk(buf, " \n"))) {
cpos = cp - buf;
@@ -1160,7 +1160,7 @@ get_quotedstring(char *buf, int n)
}
int
-get_string(char *buf, int n, FILE *iop)
+get_string(char *buf, int n)
{
int i, c;
char *cs;
@@ -1207,7 +1207,7 @@ lookup(struct tab *cmdtab, char *keyword)
}
int
-get_ip(char *buf, int n, FILE *iop)
+get_ip(char *buf, int n)
{
int i, c;
char *cs;
repomaster@centroid.eu