mysql: rename variables based on WebKit style

Signed-off-by: Rosen Penev <rosenp@gmail.com>
gerbera · Dec 9, 2021 · f33c816 · f33c816
1 parent 295ad4c
commit f33c816
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/database/mysql/mysql_database.cc b/src/database/mysql/mysql_database.cc
@@ -351,44 +351,44 @@ void MySQLDatabase::_exec(const std::string& query)
 
 /* MysqlResult */
 
-MysqlResult::MysqlResult(MYSQL_RES* mysql_res)
-    : mysql_res(mysql_res)
+MysqlResult::MysqlResult(MYSQL_RES* mysqlRes)
+    : mysqlRes(mysqlRes)
 {
 }
 
 MysqlResult::~MysqlResult()
 {
-    if (mysql_res) {
+    if (mysqlRes) {
         if (!nullRead) {
-            while (mysql_fetch_row(mysql_res))
+            while (mysql_fetch_row(mysqlRes))
                 ; // read out data
         }
-        mysql_free_result(mysql_res);
-        mysql_res = nullptr;
+        mysql_free_result(mysqlRes);
+        mysqlRes = nullptr;
     }
 }
 
 std::unique_ptr<SQLRow> MysqlResult::nextRow()
 {
-    if (auto mysqlRow = mysql_fetch_row(mysql_res); mysqlRow) {
-        return std::make_unique<MysqlRow>(mysqlRow);
+    if (auto m = mysql_fetch_row(mysqlRes)) {
+        return std::make_unique<MysqlRow>(m);
     }
     nullRead = true;
-    mysql_free_result(mysql_res);
-    mysql_res = nullptr;
+    mysql_free_result(mysqlRes);
+    mysqlRes = nullptr;
     return nullptr;
 }
 
 /* MysqlRow */
 
 MysqlRow::MysqlRow(MYSQL_ROW mysqlRow)
-    : mysql_row(mysqlRow)
+    : mysqlRow(mysqlRow)
 {
 }
 
 char* MysqlRow::col_c_str(int index) const
 {
-    return mysql_row[index];
+    return mysqlRow[index];
 }
 
 #endif // HAVE_MYSQL
diff --git a/src/database/mysql/mysql_database.h b/src/database/mysql/mysql_database.h
@@ -92,7 +92,7 @@ class MySQLDatabaseWithTransactions : public SqlWithTransactions, public MySQLDa
 
 class MysqlResult : public SQLResult {
 public:
-    explicit MysqlResult(MYSQL_RES* mysql_res);
+    explicit MysqlResult(MYSQL_RES* mysqlRes);
     ~MysqlResult() override;
 
     MysqlResult(const MysqlResult&) = delete;
@@ -101,8 +101,8 @@ class MysqlResult : public SQLResult {
 private:
     int nullRead {};
     std::unique_ptr<SQLRow> nextRow() override;
-    unsigned long long getNumRows() const override { return mysql_num_rows(mysql_res); }
-    MYSQL_RES* mysql_res;
+    unsigned long long getNumRows() const override { return mysql_num_rows(mysqlRes); }
+    MYSQL_RES* mysqlRes;
 
     friend class MysqlRow;
     friend class MySQLDatabase;
@@ -115,7 +115,7 @@ class MysqlRow : public SQLRow {
 private:
     char* col_c_str(int index) const override;
 
-    MYSQL_ROW mysql_row;
+    MYSQL_ROW mysqlRow;
 };
 
 #endif // __mysql_database_H__