1
0
mirror of https://github.com/nmap/nmap.git synced 2026-02-14 09:26:35 +00:00

Replaced strtok_r() calls by strtok().

The latter is more portable and can replace strtok_r in our case.
This commit is contained in:
henri
2013-05-02 17:32:15 +00:00
parent 6638f749d1
commit e623d8c9f1

View File

@@ -67,7 +67,6 @@ struct proxy_parser {
int done;
struct proxy_node *value;
char *str;
char *saveptr;
char *tokens;
};
@@ -384,24 +383,22 @@ struct proxy_parser *proxy_parser_new(const char *proxychainstr) {
parser->str = strdup(proxychainstr);
parser->tokens = strtok_r(parser->str, ",", &parser->saveptr);
if (parser->tokens) {
parser->tokens = strtok(parser->str, ",");
if (parser->tokens)
parser->value = proxy_node_new(parser->tokens);
} else {
else
parser->done = 1;
}
return parser;
}
void proxy_parser_next(struct proxy_parser *parser) {
parser->tokens = strtok_r(NULL, ",", &parser->saveptr);
if (parser->tokens) {
parser->tokens = strtok(NULL, ",");
if (parser->tokens)
parser->value = proxy_node_new(parser->tokens);
} else {
else
parser->done = 1;
}
}
void proxy_parser_delete(struct proxy_parser *parser) {