[med-svn] [SCM] aghermann branch, master, updated. 551e213a23b59b71cba6a9c3a282d1b60e21b854

[Andrei Zavada]

The following commit has been merged in the master branch:
commit d121546a719af6b3453f42656704901c18e2aedd
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sun Apr 21 00:23:46 2013 +0300

    use strtok_r elsewhere in CEDFFile::_parse_header

diff --git a/src/libsigfile/edf.cc b/src/libsigfile/edf.cc
index f0e1f34..aeb3bac 100644
--- a/src/libsigfile/edf.cc
+++ b/src/libsigfile/edf.cc
@@ -785,8 +785,9 @@ _parse_header()
 		else {
 		      // try parsing as "type channel" first
 			string parsable (H.label);
-			char	*_1 = strtok( &parsable[0], " :,./"),
-				*_2 = strtok( NULL, " :,./");
+			char	*savep,
+				*_1 = strtok_r( &parsable[0], " :,./", &savep),
+				*_2 = strtok_r( NULL, " :,./", &savep);
 			if ( _2 ) {
 				H.signal_type_s = _1;
 				H.signal_type = SChannel::figure_signal_type(_1);

-- 
Sleep experiment manager