Commit: 8d472b316cccc28d1eeed433b92ba414b4b992ae - readconf (git)

Unix 系のプログラムで使用される設定ファイルを読み込むためのC言語ライブラリ

Commit MetaInfo

• Revision: 8d472b316cccc28d1eeed433b92ba414b4b992ae (tree)
• Time: 2014-02-01 17:17:07
• Author: tsntsumi <tsntsumi@user...>
• Commiter: tsntsumi

Log Message

int 型変数と size_t 型変数を比較していたため、両変数とも size_t にした。

Change Summary

• modified: src/Makefile
• modified: src/readconf.c

Incremental Difference

--- a/src/Makefile
+++ b/src/Makefile
@@ -2,6 +2,6 @@
 
 PROFILERFLAGS = -fprofile-arcs -ftest-coverage
 
-CFLAGS = --std=c89 -pedantic -Wall -g $(PROFILERFLAGS)
+CFLAGS = --std=c89 -pedantic -Wall -Wextra -g $(PROFILERFLAGS)
 
 all: readconf.o

--- a/src/readconf.c
+++ b/src/readconf.c
@@ -63,7 +63,7 @@ static const char RCCommentChar = '#';
 static void readConf(RCConfItem *items, size_t numItems, FILE *conffp);
 static void initialize(RCConfItem *items, size_t numItems);
 static void readExpression(RCConfItem *items, size_t numItems, FILE *conffp);
-static RCConfItem *findItem(RCConfItem *items, int numItems, char *name);
+static RCConfItem *findItem(RCConfItem *items, size_t numItems, char *name);
 static char *readName(FILE *conffp);
 static void readValue(RCConfItem *item, FILE *conffp);
 static void readNL(FILE *conffp);
@@ -112,7 +112,7 @@ bool readconf(RCConfItem *items, size_t numItems, const char *confPath)
 
 void RCFreeStringValueInItems(RCConfItem *items, size_t numItems)
 {
-  int i;
+  size_t i;
 
   for (i = 0; i < numItems; i ++)
     {
@@ -128,7 +128,7 @@ void RCFreeStringValueInItems(RCConfItem *items, size_t numItems)
 
 void RCFreeRaisedErrors(void)
 {
-  int i;
+  size_t i;
 
   for (i = 0; i < RCNumRaisedErrors; i ++)
     {
@@ -306,9 +306,9 @@ static void readExpression(RCConfItem *items, size_t numItems, FILE *conffp)
  * @param[in] name 検索する名前。
  * @return 見つかった設定項目。見つからなかったら NULL。
  */
-static RCConfItem *findItem(RCConfItem *items, int numItems, char *name)
+static RCConfItem *findItem(RCConfItem *items, size_t numItems, char *name)
 {
-  int i;
+  size_t i;
   RCConfItem *p = items;
 
   for (i = 0; i < numItems; i ++, p ++)
@@ -339,7 +339,7 @@ static inline char *shrinkString(char *str)
 static char *readName(FILE *conffp)
 {
   char *name = calloc(RCMaxNameLength, 1);
-  int i = 0;
+  size_t i = 0;
   int c;
 
   if (name == NULL)
@@ -589,7 +589,7 @@ static void readReal(RCConfItem *item, FILE *conffp)
 static char *readQuotedString(FILE *conffp)
 {
   char *string = calloc(RCMaxStringLength, 1);
-  int i;
+  size_t i;
   int quote;
   int c;
 
@@ -648,7 +648,7 @@ static char *readQuotedString(FILE *conffp)
 static char *readBareString(FILE *conffp)
 {
   char *string = calloc(RCMaxStringLength, 1);
-  int i = 0;
+  size_t i = 0;
   int c;
 
   if (string == NULL)