Merge pull request #25656 from Dr15Jones/strtokHcalLaserEventFilter2012

Use strtok_r in HcalLaserEventFilter2012
cms-sw · Jan 16, 2019 · d5c14da · d5c14da
2 parents 958b32c + 6eb570d
commit d5c14da
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/EventFilter/HcalRawToDigi/plugins/HcalLaserEventFilter2012.cc b/EventFilter/HcalRawToDigi/plugins/HcalLaserEventFilter2012.cc
@@ -111,7 +111,8 @@ void HcalLaserEventFilter2012::readEventListFile(const string & eventFileName)
     bytes_read = gzread (file, buffer, LENGTH - 1);
     buffer[bytes_read] = '\0';
     i=0;
-    pch = strtok (buffer,"\n");
+    char* saveptr;
+    pch = strtok_r (buffer,"\n",&saveptr);
     if (buffer[0] == '\n' ) {
       addEventString(b2);
       ++i;
@@ -129,7 +130,7 @@ void HcalLaserEventFilter2012::readEventListFile(const string & eventFileName)
       } else if (i<LENGTH) {
 	addEventString(b2);
       } 
-      pch = strtok (nullptr, "\n");
+      pch = strtok_r (nullptr, "\n", &saveptr);
     }
     if (bytes_read < LENGTH - 1) {
       if (gzeof (file)) break;