make codes in /base comply with Google style except for namespace kaldi

keli78 · keli78 · commit c630f778a7b5 · 2015-10-07T13:10:26.000-04:00
diff --git a/src/base/io-funcs-test.cc b/src/base/io-funcs-test.cc
@@ -128,9 +128,10 @@ void UnitTestIo(bool binary) {
 }  // end namespace kaldi.
 
 int main() {
+  using namespace kaldi;
   for (size_t i = 0; i < 10; i++) {
-    kaldi::UnitTestIo(false);
-    kaldi::UnitTestIo(true);
+    UnitTestIo(false);
+    UnitTestIo(true);
   }
   KALDI_ASSERT(1);  // just to check that KALDI_ASSERT does not fail for 1.
   return 0;
diff --git a/src/base/kaldi-error.cc b/src/base/kaldi-error.cc
@@ -61,8 +61,8 @@ const char *GetShortFileName(const char *filename) {
 
 #if defined(HAVE_CXXABI_H) && defined(HAVE_EXECINFO_H)
 // The function name looks like a macro: it's a macro if we don't have ccxxabi.h
-inline void KALDI_APPEND_POSSIBLY_DEMANGLED_STRING(std::string &ans,
-                                                   const char *to_append) {
+inline void KALDI_APPEND_POSSIBLY_DEMANGLED_STRING(const char *to_append,
+                                                   std::string *ans) {
   // at input the string "to_append" looks like:
   //   ./kaldi-error-test(_ZN5kaldi13UnitTestErrorEv+0xb) [0x804965d]
   // We want to extract the name e.g. '_ZN5kaldi13UnitTestErrorEv",
@@ -72,7 +72,7 @@ inline void KALDI_APPEND_POSSIBLY_DEMANGLED_STRING(std::string &ans,
   const char *plus = (paren ? strchr(paren, '+') : NULL);
   if (!plus) {  // did not find the '(' or did not find the '+'
     // This is a soft failure in case we did not get what we expected.
-    ans += to_append;
+    ans->append(to_append);
     return;
   }
   std::string stripped(paren+1, plus-(paren+1));  // the bit between ( and +.
@@ -83,14 +83,14 @@ inline void KALDI_APPEND_POSSIBLY_DEMANGLED_STRING(std::string &ans,
   // to demangle, so we don't check it.
 
   if (demangled_name != NULL) {
-    ans += demangled_name;
+    ans->append(demangled_name);
     free(demangled_name);
   } else {
-    ans += to_append;  // add the original string.
+    ans->append(to_append);  // add the original string.
   }
 }
 #else  // defined(HAVE_CXXABI_H) && defined(HAVE_EXECINFO_H)
-#define KALDI_APPEND_POSSIBLY_DEMANGLED_STRING(ans, to_append) ans += to_append
+#define KALDI_APPEND_POSSIBLY_DEMANGLED_STRING(to_append, ans) ans += to_append
 #endif  // defined(HAVE_CXXABI_H) && defined(HAVE_EXECINFO_H)
 
 #ifdef HAVE_EXECINFO_H
@@ -103,17 +103,17 @@ std::string KaldiGetStackTrace() {
   char **strings = backtrace_symbols(array, size);
   if (size <= KALDI_MAX_TRACE_PRINT) {
     for (size_t i = 0; i < size; i++) {
-      KALDI_APPEND_POSSIBLY_DEMANGLED_STRING(ans, strings[i]);
+      KALDI_APPEND_POSSIBLY_DEMANGLED_STRING(strings[i], &ans);
       ans += "\n";
     }
   } else {  // print out first+last (e.g.) 5.
     for (size_t i = 0; i < KALDI_MAX_TRACE_PRINT/2; i++) {
-      KALDI_APPEND_POSSIBLY_DEMANGLED_STRING(ans, strings[i]);
+      KALDI_APPEND_POSSIBLY_DEMANGLED_STRING(strings[i], &ans);
       ans += "\n";
     }
     ans += ".\n.\n.\n";
     for (size_t i = size - KALDI_MAX_TRACE_PRINT/2; i < size; i++) {
-      KALDI_APPEND_POSSIBLY_DEMANGLED_STRING(ans, strings[i]);
+      KALDI_APPEND_POSSIBLY_DEMANGLED_STRING(strings[i], &ans);
       ans += "\n";
     }
     if (size == KALDI_MAX_TRACE_SIZE)
diff --git a/src/base/kaldi-math-test.cc b/src/base/kaldi-math-test.cc
@@ -305,17 +305,18 @@ void UnitTestLogSpeed() {
 }  // end namespace kaldi.
 
 int main() {
-  kaldi::UnitTestApproxEqual();
-  kaldi::UnitTestGcdLcm();
-  kaldi::UnitTestFactorize();
-  kaldi::UnitTestDefines();
-  kaldi::UnitTestLogAddSub();
-  kaldi::UnitTestRand();
-  kaldi::UnitTestAssertFunc();
-  kaldi::UnitTestRoundUpToNearestPowerOfTwo();
-  kaldi::UnitTestExpSpeed<float>();
-  kaldi::UnitTestExpSpeed<double>();
-  kaldi::UnitTestLogSpeed<float>();
-  kaldi::UnitTestLogSpeed<double>();
+  using namespace kaldi;
+  UnitTestApproxEqual();
+  UnitTestGcdLcm();
+  UnitTestFactorize();
+  UnitTestDefines();
+  UnitTestLogAddSub();
+  UnitTestRand();
+  UnitTestAssertFunc();
+  UnitTestRoundUpToNearestPowerOfTwo();
+  UnitTestExpSpeed<float>();
+  UnitTestExpSpeed<double>();
+  UnitTestLogSpeed<float>();
+  UnitTestLogSpeed<double>();
 }
 
diff --git a/src/base/kaldi-utils.cc b/src/base/kaldi-utils.cc
@@ -33,9 +33,9 @@ namespace kaldi {
 std::string CharToString(const char &c) {
   char buf[20];
   if (std::isprint(c))
-    sprintf(buf, "\'%c\'", c);
+    snprintf(buf, sizeof(buf), "\'%c\'", c);
   else
-    sprintf(buf, "[character %d]", static_cast<int>(c));
+    snprintf(buf, sizeof(buf), "[character %d]", static_cast<int>(c));
   return (std::string) buf;
 }
 
diff --git a/src/doc/cpplint.py b/src/doc/cpplint.py
@@ -2567,8 +2567,8 @@ def CheckLanguage(filename, clean_lines, linenum, file_extension, include_state,
     error(filename, linenum, 'runtime/memset', 4,
           'Did you mean "memset(%s, 0, %s)"?'
           % (match.group(1), match.group(2)))
-
-  if Search(r'\busing namespace\b', line):
+  match = Search(r'\busing namespace kaldi\b',line)
+  if not match and Search(r'\busing namespace\b', line):
     error(filename, linenum, 'build/namespaces', 5,
           'Do not use namespace using-directives.  '
           'Use using-declarations instead.')
