From e623d8c9f17df2a6f850e9b6d0ad652c0b2a15f8 Mon Sep 17 00:00:00 2001
From: henri <henri@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 2 May 2013 17:32:15 +0000
Subject: [PATCH] Replaced strtok_r() calls by strtok().

The latter is more portable and can replace strtok_r in our case.
---
 nsock/src/nsock_proxy.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/nsock/src/nsock_proxy.c b/nsock/src/nsock_proxy.c
index 84a51d80d..93bd12f31 100644
--- a/nsock/src/nsock_proxy.c
+++ b/nsock/src/nsock_proxy.c
@@ -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) {