Use C++ versions of C headers. work-around bug in older GNU sscanf de…

…finition

DataReader/KaldiReader/basetypes.h

@@ -67,15 +67,15 @@ OACR_WARNING_DISABLE(POTENTIAL_ARGUMENT_TYPE_MISMATCH, "Not level1 or level2_sec
 #endif
 
 #include "Platform.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>     // include here because we redefine some names later
-#include <errno.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>     // include here because we redefine some names later
+#include <cerrno>
 #include <string>
 #include <vector>
-#include <math.h>        // for HUGE_VAL // potential double isnan definition
-#include <assert.h>
-#include <stdarg.h>
+#include <cmath>        // for HUGE_VAL // potential double isnan definition
+#include <cassert>
+#include <cstdarg>
 #include <map>
 #include <stdexcept>
 #include <locale>       // std::wstring_convert

DataReader/KaldiReader/fileutil.h

@@ -8,7 +8,7 @@
 #define _FILEUTIL_
 
 #include "Platform.h"
-#include <stdio.h>
+#include <cstdio>
 #ifdef __unix__
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -18,10 +18,10 @@
 #include <map>
 #include <functional>
 #include <cctype>
-#include <errno.h>
-#include <stdint.h>
-#include <assert.h>
-#include <string.h>     // for strerror()
+#include <cerrno>
+#include <cstdint>
+#include <cassert>
+#include <cstring>     // for strerror()
 
 using namespace std;
 

DataReader/KaldiReader/htkfeatio.h

@@ -15,9 +15,9 @@
 #include <regex>
 #include <set>
 #include <unordered_map>
-#include <stdint.h>
-#include <limits.h>
-#include <wchar.h>
+#include <cstdint>
+#include <climits>
+#include <cwchar>
 #include <fstream>
 #include "util/common-utils.h"
 #include "base/kaldi-common.h"

DataReader/KaldiReader/latticearchive.h

@@ -17,8 +17,8 @@
 #include "latticestorage.h"
 #include "simple_checked_arrays.h"
 #include "fileutil.h"
-#include <stdint.h>
-#include <inttypes.h>
+#include <cstdint>
+#include <cinttypes>
 #include <vector>
 #include <string>
 #include <algorithm>        // for find()
@@ -1132,7 +1132,8 @@ class archive
                 throw std::runtime_error ("open: invalid TOC line (empty archive pathname): " + std::string (line));
             char c;
             uint64_t offset;
-            if (sscanf(q, "[%" PRId64 "]%c", &offset, &c) != 1)
+            const char *scanformat = "[%" PRId64 "]%c"; // Work-around for GNU/Linux bug in sscanf in older libc (2.15) versions
+            if (sscanf(q, scanformat, &offset, &c) != 1)
                 throw std::runtime_error ("open: invalid TOC line (bad [] expression): " + std::string (line));
             if (!toc.insert (make_pair (key, latticeref (offset, archiveindex))).second)
                 throw std::runtime_error ("open: TOC entry leads to duplicate key: " + std::string (line));

DataReader/KaldiReader/latticestorage.h

@@ -12,7 +12,7 @@
 #pragma once
 #include <string>       // for the error message in checkoverflow() only
 #include <stdexcept>
-#include <stdint.h>
+#include <cstdint>
 
 #undef INITIAL_STRANGE              // [v-hansu] intialize structs to strange values
 #define PARALLEL_SIL                // [v-hansu] process sil on CUDA, used in other files, please search this

DataReader/KaldiReader/minibatchsourcehelpers.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "basetypes.h"
-#include <stdio.h>
+#include <cstdio>
 #include <vector>
 #include <algorithm>
 

DataReader/KaldiReader/simple_checked_arrays.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <stddef.h>     // for size_t
-#include <assert.h>
+#include <cstddef>     // for size_t
+#include <cassert>
 
 // ---------------------------------------------------------------------------
 // array_ref -- wraps a C pointer to an array together with its size.