文字列数を定数化

git-svn-id: svn+ssh://svn.osdn.net/svnroot/unagi@243 24ea1065-a21e-4ca1-99c9-f5125deb0858

diff --git a/client/trunk/config.h b/client/trunk/config.h
index ae46c78..a987f91 100644 (file)
--- a/client/trunk/config.h
+++ b/client/trunk/config.h
@@ -1,6 +1,11 @@
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
 #include "reader_master.h"
+enum{
+       CONFIG_OVERRIDE_UNDEF = 4649,
+       CONFIG_OVERRIDE_TRUE = 1,
+       CONFIG_STR_LENGTH = 20
+};
 struct st_config{
        //override config
        long mapper;
@@ -15,12 +20,8 @@ struct st_config{
        int mode, syntaxtest;
        //debug member
        long write_wait;
-       char flash_test_device[20];
-       char flash_test_mapper[20];
-};
-enum{
-       CONFIG_OVERRIDE_UNDEF = 4649,
-       CONFIG_OVERRIDE_TRUE = 1
+       char flash_test_device[CONFIG_STR_LENGTH];
+       char flash_test_mapper[CONFIG_STR_LENGTH];
 };
 
 enum{

diff --git a/client/trunk/unagi.c b/client/trunk/unagi.c
index 35f219c..bd49253 100644 (file)
--- a/client/trunk/unagi.c
+++ b/client/trunk/unagi.c
@@ -96,11 +96,11 @@ static int config_file_load(struct st_config *c)
                        }
                }else if(strcmp("TEST_DEVICE", word[0]) == 0){
                        if(DEBUG == 1){
-                               strncpy(c->flash_test_device, word[1], 20);
+                               strncpy(c->flash_test_device, word[1], CONFIG_STR_LENGTH);
                        }
                }else if(strcmp("TEST_MAPPER", word[0]) == 0){
                        if(DEBUG == 1){
-                               strncpy(c->flash_test_mapper, word[1], 20);
+                               strncpy(c->flash_test_mapper, word[1], CONFIG_STR_LENGTH);
                        }
                }else{
                        printf("%s unknown config title %s", PREFIX_CONFIG_ERROR, word[1]);