Applying Google C++ Style Guide

Author: vanvught

common/include/common/firmware/jamstapl/handleroled.h

@@ -45,7 +45,7 @@
 
 namespace console
 {
-void ConsoleError(const char*);
+void Error(const char*);
 }
 
 void debug_heap();
@@ -150,7 +150,7 @@ extern "C"
 
             if (next > block_limit)
             {
-                console::ConsoleError("malloc: out of memory\n");
+                console::Error("malloc: out of memory\n");
 #ifdef DEBUG_HEAP
                 debug_heap();
 #endif

common/include/common/firmware/pixeldmx/show.h

@@ -28,7 +28,7 @@
 
 namespace console
 {
-void ConsoleError(const char*);
+void Error(const char*);
 int Putc(int);
 int Puts(const char*);
 } // namespace console
@@ -106,11 +106,11 @@ extern "C"
 
         if (s && *s)
         {
-            console::ConsoleError(s);
+            console::Error(s);
             console::Puts(": ");
         }
 
-        console::ConsoleError(ptr);
+        console::Error(ptr);
         console::Putc('\n');
     }
 }

common/include/common/utils/utils_array.h

@@ -24,7 +24,6 @@
  */
 
 #include <cstdio>
-
 #include <cstddef>
 #include <cstdint>
 #include <time.h>
@@ -33,22 +32,22 @@ namespace global {
 int32_t g_nUtcOffset = 0;
 }  // namespace global
 
-static constexpr int DAYS_OF_MONTH[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+static constexpr int kDaysOfMonth[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
 
-static int isleapyear(const int year) {
+static int Isleapyear(int year) {
 	if (year % 100 == 0) {
 		return year % 400 == 0;
 	}
 
 	return year % 4 == 0;
 }
 
-static int getdaysofmonth(const int month, const int year) {
-	if ((month == 1) && isleapyear(year)) {
+static int Getdaysofmonth(int month, int year) {
+	if ((month == 1) && Isleapyear(year)) {
 		return 29;
 	}
 
-	return DAYS_OF_MONTH[month];
+	return kDaysOfMonth[month];
 }
 
 static struct tm Tm;
@@ -80,41 +79,41 @@ struct tm *gmtime(const time_t *pTime) {
 
 	Tm.tm_wday = (nTime + 4) % 7;
 
-	int nYear = 1970;
+	int year = 1970;
 
 	while (1) {
-		const time_t nDaysOfYear = isleapyear(nYear) ? 366 : 365;
+		const time_t nDaysOfYear = Isleapyear(year) ? 366 : 365;
 		if (nTime < nDaysOfYear) {
 			break;
 		}
 
 		nTime -= nDaysOfYear;
-		nYear++;
+		year++;
 	}
 
-	Tm.tm_year = nYear - 1900;
+	Tm.tm_year = year - 1900;
 	Tm.tm_yday = nTime;
 
-	int nMonth = 0;
+	int month = 0;
 
 	while (1) {
-		const time_t nDaysOfMonth = getdaysofmonth(nMonth, nYear);
+		const time_t nDaysOfMonth = Getdaysofmonth(month, year);
 		if (nTime < nDaysOfMonth) {
 			break;
 		}
 
 		nTime -= nDaysOfMonth;
-		nMonth++;
+		month++;
 	}
 
-	Tm.tm_mon = nMonth;
+	Tm.tm_mon = month;
 	Tm.tm_mday = nTime + 1;
 
 	return &Tm;
 }
 
 time_t mktime(struct tm *pTm) {
-	time_t nResult = 0;
+	time_t result = 0;
 
 	if (pTm == nullptr) {
 		return -1;
@@ -124,49 +123,49 @@ time_t mktime(struct tm *pTm) {
 		return -1;
 	}
 
-	int nYear;
+	int year;
 
-	for (nYear = 1970; nYear < 1900 + pTm->tm_year; nYear++) {
-		nResult += isleapyear(nYear) ? 366 : 365;
+	for (year = 1970; year < 1900 + pTm->tm_year; year++) {
+		result += Isleapyear(year) ? 366 : 365;
 	}
 
 	if (pTm->tm_mon < 0 || pTm->tm_mon > 11) {
 		return -1;
 	}
 
-	int nMonth;
+	int month;
 
-	for (nMonth = 0; nMonth < pTm->tm_mon; nMonth++) {
-		nResult += getdaysofmonth(nMonth, pTm->tm_year);
+	for (month = 0; month < pTm->tm_mon; month++) {
+		result += Getdaysofmonth(month, pTm->tm_year);
 	}
 
-	if (pTm->tm_mday < 1 || pTm->tm_mday > getdaysofmonth(pTm->tm_mon, pTm->tm_year)) {
+	if (pTm->tm_mday < 1 || pTm->tm_mday > Getdaysofmonth(pTm->tm_mon, pTm->tm_year)) {
 		return -1;
 	}
 
-	nResult += pTm->tm_mday - 1;
-	nResult *= 24;
+	result += pTm->tm_mday - 1;
+	result *= 24;
 
 	if (pTm->tm_hour < 0 || pTm->tm_hour > 23) {
 		return -1;
 	}
 
-	nResult += pTm->tm_hour;
-	nResult *= 60;
+	result += pTm->tm_hour;
+	result *= 60;
 
 	if (pTm->tm_min < 0 || pTm->tm_min > 59) {
 		return -1;
 	}
 
-	nResult += pTm->tm_min;
-	nResult *= 60;
+	result += pTm->tm_min;
+	result *= 60;
 
 	if (pTm->tm_sec < 0 || pTm->tm_sec > 59) {
 		return -1;
 	}
 
-	nResult += pTm->tm_sec;
+	result += pTm->tm_sec;
 
-	return nResult;
+	return result;
 }
 }