diff options
author | Anders Broman <anders.broman@ericsson.com> | 2010-03-07 18:56:35 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2010-03-07 18:56:35 +0000 |
commit | ed5d503e5f8642da71585e715d219eb033d46230 (patch) | |
tree | 84f5627faa9ab7a281a08ef84204e3e4c368bdb1 /tap-diameter-avp.c | |
parent | 10d19c3d98fd755a4d80df0ddd314c1654d5a10b (diff) | |
download | wireshark-ed5d503e5f8642da71585e715d219eb033d46230.tar.gz |
Use strtok_s on windows and strtok_r otherwise.
svn path=/trunk/; revision=32138
Diffstat (limited to 'tap-diameter-avp.c')
-rw-r--r-- | tap-diameter-avp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tap-diameter-avp.c b/tap-diameter-avp.c index 84cc4feded..786e05d366 100644 --- a/tap-diameter-avp.c +++ b/tap-diameter-avp.c @@ -242,7 +242,11 @@ diameteravp_init(const char *optarg, void* userdata _U_) ds->filter=g_malloc0(filter_len); strcat(ds->filter,"diameter"); +#if defined (_WIN32) for(str=strtok_s(options+sizeof("diameter,avp"),",",&saveptr);str;str=strtok_s(NULL,",",&saveptr)) +#else + for(str=strtok_r(options+sizeof("diameter,avp"),",",&saveptr);str;str=strtok_r(NULL,",",&saveptr)) +#endif { /* Connect all requested fields with logical OR. */ strcat(ds->filter,"||"); |