small bagfix

git-svn-id: http://svn.osdn.jp/svnroot/mimic/trunk@270 47198e57-cb75-475f-84c4-a814cd6f29e0

diff --git a/lib/src/NyLPC_cMiMicEnv.h b/lib/src/NyLPC_cMiMicEnv.h
index 2cc930a..16503bd 100644 (file)
--- a/lib/src/NyLPC_cMiMicEnv.h
+++ b/lib/src/NyLPC_cMiMicEnv.h
@@ -13,7 +13,7 @@ extern "C" {
 #endif /* __cplusplus */\r
 \r
 \r
-#define NyLPC_cMiMicEnv_VERSION "MiMic/1.4.11"\r
+#define NyLPC_cMiMicEnv_VERSION "MiMic/1.4.14"\r
 \r
 \r
 #ifdef __cplusplus\r

diff --git a/lib/src/net/httpd/mod/NyLPC_cModFileIoBaseClass.c b/lib/src/net/httpd/mod/NyLPC_cModFileIoBaseClass.c
index e16f81f..9533152 100644 (file)
--- a/lib/src/net/httpd/mod/NyLPC_cModFileIoBaseClass.c
+++ b/lib/src/net/httpd/mod/NyLPC_cModFileIoBaseClass.c
@@ -68,7 +68,7 @@ static NyLPC_TBool messageHandler(NyLPC_TcHttpBasicHeaderParser_t* i_inst,const
  */\r
 #define CONTENT_ID_UPLOAD  2\r
 #define CONTENT_ID_CREATE  3\r
-#define CONTENT_ID_DELETE  4\r
+#define CONTENT_ID_REMOVE  4\r
 #define CONTENT_ID_UNKNOWN 0\r
 \r
 \r
@@ -80,7 +80,7 @@ static const struct NyLPC_TTextIdTbl url_tbl[]=
 {\r
        {"upload.api",CONTENT_ID_UPLOAD},\r
        {"create.api",CONTENT_ID_CREATE},\r
-       {"delete.api",CONTENT_ID_DELETE},\r
+       {"remove.api",CONTENT_ID_REMOVE},\r
        {NULL,CONTENT_ID_UNKNOWN}\r
 };\r
 \r
@@ -113,7 +113,7 @@ static NyLPC_TBool urlHandler(NyLPC_TcHttpBasicHeaderParser_t* i_inst,NyLPC_TCha
                        {\r
                        case CONTENT_ID_UPLOAD:\r
                        case CONTENT_ID_CREATE:\r
-                       case CONTENT_ID_DELETE:\r
+                       case CONTENT_ID_REMOVE:\r
                                break;\r
                        default:\r
                                NyLPC_OnErrorGoto(ERROR);\r
@@ -127,7 +127,7 @@ static NyLPC_TBool urlHandler(NyLPC_TcHttpBasicHeaderParser_t* i_inst,NyLPC_TCha
        {\r
        case CONTENT_ID_UPLOAD:\r
        case CONTENT_ID_CREATE:\r
-       case CONTENT_ID_DELETE:\r
+       case CONTENT_ID_REMOVE:\r
                switch(out->_astate){\r
                case ST_PARSE_QUERY_NAME:\r
                        if(i_c!='\0' && i_c!='&' && i_c!='='){\r
@@ -298,12 +298,12 @@ NyLPC_TBool NyLPC_cModFileIoBaseClass_execute(NyLPC_TcModFileIoBaseClass_t* i_in
                                break;\r
                        }\r
                        NyLPC_OnErrorGoto(Error2_405);\r
-               case CONTENT_ID_DELETE:\r
+               case CONTENT_ID_REMOVE:\r
                        //ファイル名を通知\r
                        if(method_type==NyLPC_THttpMethodType_GET || method_type==NyLPC_THttpMethodType_HEAD)\r
                        {\r
                                //イベント起動\r
-                               if(!i_inst->_abstruct_function.delete(i_connection,single_header.fname)){\r
+                               if(!i_inst->_abstruct_function.remove(i_connection,single_header.fname)){\r
                                        NyLPC_cHttpdConnection_setConnectionMode(i_connection,NyLPC_TcHttpdConnection_CONNECTION_MODE_CLOSE);\r
                                }\r
                                break;\r

diff --git a/lib/src/net/httpd/mod/NyLPC_cModFileIoBaseClass.h b/lib/src/net/httpd/mod/NyLPC_cModFileIoBaseClass.h
index a4c34eb..33f19a5 100644 (file)
--- a/lib/src/net/httpd/mod/NyLPC_cModFileIoBaseClass.h
+++ b/lib/src/net/httpd/mod/NyLPC_cModFileIoBaseClass.h
@@ -49,7 +49,7 @@ typedef NyLPC_TBool (*NyLPC_cModFileIoBaseClass_createFunction)(NyLPC_TcHttpdCon
  * @return\r
  * 処理が失敗した場合はFALSEを返します。FALSEを返すとCallerはHTTPセッションを切断します。\r
  */\r
-typedef NyLPC_TBool (*NyLPC_cModFileIoBaseClass_deleteFunction)(NyLPC_TcHttpdConnection_t* i_connection,const NyLPC_TChar* i_fname);\r
+typedef NyLPC_TBool (*NyLPC_cModFileIoBaseClass_removeFunction)(NyLPC_TcHttpdConnection_t* i_connection,const NyLPC_TChar* i_fname);\r
 \r
 /**\r
  * Abstruct関数テーブル\r
@@ -58,7 +58,7 @@ struct NyLPC_TcModFileIoBaseClass_AbstructFunction
 {\r
        NyLPC_cModFileIoBaseClass_uploadFunction upload;\r
        NyLPC_cModFileIoBaseClass_createFunction create;\r
-       NyLPC_cModFileIoBaseClass_deleteFunction delete;\r
+       NyLPC_cModFileIoBaseClass_removeFunction remove;\r
 };\r
 \r
 /**\r