• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Aucun tag

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqtwindows誰得cocoapythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

Virtual machine Management Terminal User Interface


Commit MetaInfo

Révision19145bc07e67effd0eeaff247b41193710a3f69e (tree)
l'heure2022-08-20 21:21:09
AuteurKoine Yuusuke(koinec) <koinec@user...>
CommiterKoine Yuusuke(koinec)

Message de Log

Tested KeyVal_SetData(), KeyVal_GetData(), KeyVal_DeleteData().

Change Summary

Modification

--- a/src/keyval.c
+++ b/src/keyval.c
@@ -74,44 +74,8 @@ KeyVal_Item *
7474
7575 /* ===========================================================================*/
7676 VMTUI_KEYVAL_EXTERN
77-KeyVal_Data *
78- KeyVal_GetData(
79- KeyVal_Info *p_kvinfo,
80- char *pstr_fullkey ) {
81-
82- char str_key[(KEYVAL_MAXLEN_KEY * KEYVAL_MAXDEPTH_KEY) + 1];
83- char *pstr_next;
84- char *pstr_now;
85- KeyVal_Item *p_item = NULL;
86- int i_parent = KEYVAL_NONEID;
87-
88- if( NULL == p_kvinfo ) {
89- return NULL;
90- }
91-
92- if( NULL == pstr_fullkey ) {
93- return NULL;
94- }
95-
96- strncpy( str_key, pstr_fullkey, (KEYVAL_MAXLEN_KEY * KEYVAL_MAXDEPTH_KEY) + 1 );
97-
98- pstr_next = str_key;
99- do {
100- pstr_now = strsep( &pstr_next, "/" );
101- p_item = KeyVal_SearchItem( p_kvinfo, pstr_now, i_parent );
102- if( NULL != p_item )
103- { i_parent = (int)(p_item - p_kvinfo->p_items); }
104- }while(( NULL != pstr_next ) || ( NULL == p_item ) );
105-
106- if( NULL == p_item ) { return NULL; }
107-
108- return &(p_item->value);
109-}
110-
111-/* ===========================================================================*/
112-VMTUI_KEYVAL_EXTERN
11377 int
114- KeyVal_RegistData(
78+ KeyVal_RegistItem(
11579 KeyVal_Info *p_kvinfo,
11680 char *pstr_key,
11781 KeyVal_Data *p_value,
@@ -185,6 +149,88 @@ int
185149 /* ===========================================================================*/
186150 VMTUI_KEYVAL_EXTERN
187151 int
152+ KeyVal_RemoveItem(
153+ KeyVal_Info *p_kvinfo,
154+ char *pstr_key,
155+ int i_parent ) {
156+
157+ int i_id;
158+ int i_cnt;
159+ KeyVal_Item *p_item;
160+ KeyVal_Item *p_now;
161+
162+ if( NULL == p_kvinfo ) {
163+ return -0x02;
164+ }
165+
166+ if( NULL == pstr_key ) {
167+ return -0x03;
168+ }
169+
170+ p_item = KeyVal_SearchItem( p_kvinfo, pstr_key, i_parent );
171+ if( NULL == p_item ) {
172+ return -0x04;
173+ }
174+ i_id = (int)(p_item - p_kvinfo->p_items);
175+
176+ for( i_cnt = 0; i_cnt < p_kvinfo->i_used; i_cnt++ ) {
177+ p_now = (p_kvinfo->p_items + i_cnt);
178+
179+ if( i_id == p_now->i_parent ) {
180+ KeyVal_RemoveItem( p_kvinfo, p_now->str_key, i_id );
181+ }
182+ }
183+
184+ p_item->value.b_type = KEYVAL_TYPE_NONE;
185+ p_item->i_parent = KEYVAL_NONEID;
186+ p_item->dw_keyhash = 0x00;
187+ p_item->str_key[0] = '\0';
188+
189+ return 0x00;
190+}
191+
192+/* ===========================================================================*/
193+VMTUI_KEYVAL_EXTERN
194+int
195+ KeyVal_GetData(
196+ KeyVal_Data *p_data,
197+ KeyVal_Info *p_kvinfo,
198+ char *pstr_fullkey ) {
199+
200+ char str_key[(KEYVAL_MAXLEN_KEY * KEYVAL_MAXDEPTH_KEY) + 1];
201+ char *pstr_next;
202+ char *pstr_now;
203+ KeyVal_Item *p_item = NULL;
204+ int i_parent = KEYVAL_NONEID;
205+
206+ if( NULL == p_kvinfo ) {
207+ return -0x01;
208+ }
209+
210+ if( NULL == pstr_fullkey ) {
211+ return -0x02;
212+ }
213+
214+ strncpy( str_key, pstr_fullkey, (KEYVAL_MAXLEN_KEY * KEYVAL_MAXDEPTH_KEY) + 1 );
215+
216+ pstr_next = str_key;
217+ do {
218+ pstr_now = strsep( &pstr_next, "/" );
219+ p_item = KeyVal_SearchItem( p_kvinfo, pstr_now, i_parent );
220+ if( NULL != p_item )
221+ { i_parent = (int)(p_item - p_kvinfo->p_items); }
222+ }while(( NULL != pstr_next ) && ( NULL != p_item ) );
223+
224+ if( NULL == p_item ) { return -0x03; }
225+
226+ memcpy( p_data, &(p_item->value), sizeof( KeyVal_Data ) );
227+
228+ return 0x00;
229+}
230+
231+/* ===========================================================================*/
232+VMTUI_KEYVAL_EXTERN
233+int
188234 KeyVal_SetData(
189235 KeyVal_Info *p_kvinfo,
190236 char *pstr_fullkey,
@@ -196,6 +242,7 @@ int
196242 int i_parent = KEYVAL_NONEID;
197243 int i_id;
198244 KeyVal_Data t_parent;
245+ KeyVal_Item *p_item;
199246
200247 if( NULL == p_kvinfo ) {
201248 return -0x02;
@@ -212,13 +259,22 @@ int
212259 pstr_next = str_key;
213260 do {
214261 pstr_now = strsep( &pstr_next, "/" );
215- //p_item = KeyVal_SearchItem( p_kvinfo, pstr_now, i_parent );
216262
217- if( NULL == pstr_next ) {
218- i_id = KeyVal_RegistData( p_kvinfo, pstr_now, p_value, i_parent );
263+ p_item = KeyVal_SearchItem( p_kvinfo, pstr_now, i_parent );
264+ if( NULL != p_item ) {
265+ i_parent = (int)(p_item - p_kvinfo->p_items);
266+ if( NULL == pstr_next ) {
267+ // Update Data ---
268+ memcpy( &(p_item->value), p_value, sizeof( KeyVal_Data ) );
269+ }
219270 }
220271 else {
221- i_parent = KeyVal_RegistData( p_kvinfo, pstr_now, &t_parent, i_parent );
272+ if( NULL == pstr_next ) {
273+ i_id = KeyVal_RegistItem( p_kvinfo, pstr_now, p_value, i_parent );
274+ }
275+ else {
276+ i_parent = KeyVal_RegistItem( p_kvinfo, pstr_now, &t_parent, i_parent );
277+ }
222278 }
223279
224280 }while(( NULL != pstr_next ) || ( KEYVAL_NONEID > i_id ) || ( KEYVAL_NONEID > i_parent ) );
@@ -229,42 +285,42 @@ int
229285 /* ===========================================================================*/
230286 VMTUI_KEYVAL_EXTERN
231287 int
232- KeyVal_RemoveData(
288+ KeyVal_DeleteData(
233289 KeyVal_Info *p_kvinfo,
234- char *pstr_key,
235- int i_parent ) {
290+ char *pstr_fullkey ) {
236291
237- int i_id;
238- int i_cnt;
239- KeyVal_Item *p_item;
240- KeyVal_Item *p_now;
292+ char str_key[(KEYVAL_MAXLEN_KEY * KEYVAL_MAXDEPTH_KEY) + 1];
293+ char *pstr_next;
294+ char *pstr_now;
295+ KeyVal_Item *p_item = NULL;
296+ int i_parent = KEYVAL_NONEID;
297+ int i_err;
241298
242299 if( NULL == p_kvinfo ) {
243- return -0x02;
300+ return -0x01;
244301 }
245302
246- if( NULL == pstr_key ) {
247- return -0x03;
303+ if( NULL == pstr_fullkey ) {
304+ return -0x02;
248305 }
249306
250- p_item = KeyVal_SearchItem( p_kvinfo, pstr_key, i_parent );
251- if( NULL == p_item ) {
252- return -0x04;
253- }
254- i_id = (int)(p_item - p_kvinfo->p_items);
307+ strncpy( str_key, pstr_fullkey, (KEYVAL_MAXLEN_KEY * KEYVAL_MAXDEPTH_KEY) + 1 );
255308
256- for( i_cnt = 0; i_cnt < p_kvinfo->i_used; i_cnt++ ) {
257- p_now = (p_kvinfo->p_items + i_cnt);
309+ pstr_next = str_key;
310+ do {
311+ pstr_now = strsep( &pstr_next, "/" );
258312
259- if( i_id == p_now->i_parent ) {
260- KeyVal_RemoveData( p_kvinfo, p_now->str_key, i_id );
313+ if( NULL == pstr_next ) {
314+ i_err = KeyVal_RemoveItem( p_kvinfo, pstr_now, i_parent );
261315 }
262- }
316+ else {
317+ p_item = KeyVal_SearchItem( p_kvinfo, pstr_now, i_parent );
318+ if( NULL != p_item )
319+ { i_parent = (int)(p_item - p_kvinfo->p_items); }
320+ }
321+ }while(( NULL != pstr_next ) && ( KEYVAL_NONEID != i_parent ) );
263322
264- p_item->value.b_type = KEYVAL_TYPE_NONE;
265- p_item->i_parent = KEYVAL_NONEID;
266- p_item->dw_keyhash = 0x00;
267- p_item->str_key[0] = '\0';
323+ if( 0x00 != i_err ) { return -0x03; }
268324
269325 return 0x00;
270326 }
--- a/src/keyval.h
+++ b/src/keyval.h
@@ -127,16 +127,12 @@ typedef struct {
127127 #else
128128 #define VMTUI_KEYVAL_EXTERN extern
129129 #endif
130-VMTUI_KEYVAL_EXTERN KeyVal_Item *KeyVal_SearchItem(
131- KeyVal_Info *p_kvinfo, char *pstr_key, int i_parent );
132-VMTUI_KEYVAL_EXTERN KeyVal_Data *KeyVal_GetData(
133- KeyVal_Info *p_kvinfo, char *pstr_fullkey );
134-VMTUI_KEYVAL_EXTERN int KeyVal_RegistData(
135- KeyVal_Info *p_kvinfo, char *pstr_key,
136- KeyVal_Data *p_value, int i_parent );
137-VMTUI_KEYVAL_EXTERN int KeyVal_SetData(
138- KeyVal_Info *p_kvinfo, char *pstr_fullkey, KeyVal_Data *p_value );
139-VMTUI_KEYVAL_EXTERN int KeyVal_RemoveData( KeyVal_Info *p_kvinfo, char *pstr_key, int i_parent );
130+VMTUI_KEYVAL_EXTERN KeyVal_Item *KeyVal_SearchItem( KeyVal_Info *p_kvinfo, char *pstr_key, int i_parent );
131+VMTUI_KEYVAL_EXTERN int KeyVal_RegistItem( KeyVal_Info *p_kvinfo, char *pstr_key, KeyVal_Data *p_value, int i_parent );
132+VMTUI_KEYVAL_EXTERN int KeyVal_RemoveItem( KeyVal_Info *p_kvinfo, char *pstr_key, int i_parent );
133+VMTUI_KEYVAL_EXTERN int KeyVal_GetData( KeyVal_Data *p_data, KeyVal_Info *p_kvinfo, char *pstr_fullkey );
134+VMTUI_KEYVAL_EXTERN int KeyVal_SetData( KeyVal_Info *p_kvinfo, char *pstr_fullkey, KeyVal_Data *p_value );
135+VMTUI_KEYVAL_EXTERN int KeyVal_DeleteData( KeyVal_Info *p_kvinfo, char *pstr_fullkey );
140136 VMTUI_KEYVAL_EXTERN int KeyVal_Init( KeyVal_Info *p_keyval, int i_allocs );
141137 VMTUI_KEYVAL_EXTERN int KeyVal_Term( KeyVal_Info *p_keyval );
142138
--- a/src/test_keyval.c
+++ b/src/test_keyval.c
@@ -86,9 +86,9 @@ void
8686
8787 /* ===========================================================================*/
8888 void
89- Test_KeyVal_RegistData_001( void ) {
89+ Test_KeyVal_RegistItem_001( void ) {
9090
91- // for RegistData / SearchItem / RemoveData Basical Test ---
91+ // for RegistItem / SearchItem / RemoveItem Basical Test ---
9292
9393 int i_id;
9494 int i_err;
@@ -109,7 +109,7 @@ void
109109
110110 KEYVAL_DATA_SET_INT(t_data, 12345678 );
111111 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
112- i_id = KeyVal_RegistData( &t_keyval, "test0", &t_data, KEYVAL_NONEID );
112+ i_id = KeyVal_RegistItem( &t_keyval, "test0", &t_data, KEYVAL_NONEID );
113113 CU_ASSERT( 0 == i_id );
114114
115115 p_item = KeyVal_SearchItem( &t_keyval, "test0", KEYVAL_NONEID );
@@ -117,7 +117,7 @@ void
117117 CU_ASSERT( IS_KEYVAL_TYPE_INT( p_item->value ) );
118118 CU_ASSERT( 12345678 == KEYVAL_DATA_INT( p_item->value ) );
119119
120- i_err = KeyVal_RemoveData( &t_keyval, "test0", KEYVAL_NONEID );
120+ i_err = KeyVal_RemoveItem( &t_keyval, "test0", KEYVAL_NONEID );
121121 CU_ASSERT( 0x00 == i_err );
122122
123123 p_item = KeyVal_SearchItem( &t_keyval, "test0", KEYVAL_NONEID );
@@ -126,15 +126,15 @@ void
126126 // Phase 2 ----
127127 KEYVAL_DATA_SET_INT(t_data, 12345678 );
128128 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
129- i_id = KeyVal_RegistData( &t_keyval, "test1", &t_data, KEYVAL_NONEID );
129+ i_id = KeyVal_RegistItem( &t_keyval, "test1", &t_data, KEYVAL_NONEID );
130130 CU_ASSERT( 0 == i_id );
131131
132132 KEYVAL_DATA_SET_INT(t_data, 87654321 );
133- i_id = KeyVal_RegistData( &t_keyval, "test0", &t_data, KEYVAL_NONEID );
133+ i_id = KeyVal_RegistItem( &t_keyval, "test0", &t_data, KEYVAL_NONEID );
134134 CU_ASSERT( 1 == i_id );
135135
136136 KEYVAL_DATA_SET_INT(t_data, 22222222 );
137- i_id = KeyVal_RegistData( &t_keyval, "test2222", &t_data, KEYVAL_NONEID );
137+ i_id = KeyVal_RegistItem( &t_keyval, "test2222", &t_data, KEYVAL_NONEID );
138138 CU_ASSERT( 2 == i_id );
139139
140140 p_item = KeyVal_SearchItem( &t_keyval, "test0", KEYVAL_NONEID );
@@ -152,7 +152,7 @@ void
152152 CU_ASSERT( IS_KEYVAL_TYPE_INT( p_item->value ) );
153153 CU_ASSERT( 12345678 == KEYVAL_DATA_INT( p_item->value ) );
154154
155- i_err = KeyVal_RemoveData( &t_keyval, "test0", KEYVAL_NONEID );
155+ i_err = KeyVal_RemoveItem( &t_keyval, "test0", KEYVAL_NONEID );
156156 CU_ASSERT( 0x00 == i_err );
157157
158158 p_item = KeyVal_SearchItem( &t_keyval, "test0", KEYVAL_NONEID );
@@ -169,11 +169,11 @@ void
169169 CU_ASSERT( 22222222 == KEYVAL_DATA_INT( p_item->value ) );
170170
171171 KEYVAL_DATA_SET_INT(t_data, 87654321 );
172- i_id = KeyVal_RegistData( &t_keyval, "test0", &t_data, KEYVAL_NONEID );
172+ i_id = KeyVal_RegistItem( &t_keyval, "test0", &t_data, KEYVAL_NONEID );
173173 CU_ASSERT( 1 == i_id );
174174
175175 KEYVAL_DATA_SET_INT(t_data, 88888888 );
176- i_id = KeyVal_RegistData( &t_keyval, "test0", &t_data, KEYVAL_NONEID );
176+ i_id = KeyVal_RegistItem( &t_keyval, "test0", &t_data, KEYVAL_NONEID );
177177 CU_ASSERT( 1 == i_id );
178178
179179 p_item = KeyVal_SearchItem( &t_keyval, "test0", KEYVAL_NONEID );
@@ -181,13 +181,13 @@ void
181181 CU_ASSERT( IS_KEYVAL_TYPE_INT( p_item->value ) );
182182 CU_ASSERT( 88888888 == KEYVAL_DATA_INT( p_item->value ) );
183183
184- i_err = KeyVal_RemoveData( &t_keyval, "test1", KEYVAL_NONEID );
184+ i_err = KeyVal_RemoveItem( &t_keyval, "test1", KEYVAL_NONEID );
185185 CU_ASSERT( 0x00 == i_err );
186186
187- i_err = KeyVal_RemoveData( &t_keyval, "test0", KEYVAL_NONEID );
187+ i_err = KeyVal_RemoveItem( &t_keyval, "test0", KEYVAL_NONEID );
188188 CU_ASSERT( 0x00 == i_err );
189189
190- i_err = KeyVal_RemoveData( &t_keyval, "test2222", KEYVAL_NONEID );
190+ i_err = KeyVal_RemoveItem( &t_keyval, "test2222", KEYVAL_NONEID );
191191 CU_ASSERT( 0x00 == i_err );
192192
193193 p_item = KeyVal_SearchItem( &t_keyval, "test0", KEYVAL_NONEID );
@@ -211,9 +211,9 @@ void
211211
212212 /* ===========================================================================*/
213213 void
214- Test_KeyVal_RegistData_002( void ) {
214+ Test_KeyVal_RegistItem_002( void ) {
215215
216- // for RegistData / SearchItem / RemoveData Depth Test ---
216+ // for RegistItem / SearchItem / RemoveItem Depth Test ---
217217
218218 int i_id;
219219 int i_err;
@@ -231,47 +231,47 @@ void
231231 // Phase 1 ----
232232 KEYVAL_DATA_SET_INT(t_data, 0 );
233233 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
234- i_id = KeyVal_RegistData( &t_keyval, "depth0", &t_data, KEYVAL_NONEID );
234+ i_id = KeyVal_RegistItem( &t_keyval, "depth0", &t_data, KEYVAL_NONEID );
235235 CU_ASSERT( 0 == i_id );
236236
237237 KEYVAL_DATA_SET_INT(t_data, 11 );
238238 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
239- i_id = KeyVal_RegistData( &t_keyval, "depth1", &t_data, 0 );
239+ i_id = KeyVal_RegistItem( &t_keyval, "depth1", &t_data, 0 );
240240 CU_ASSERT( 1 == i_id );
241241
242242 KEYVAL_DATA_SET_INT(t_data, 222 );
243243 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
244- i_id = KeyVal_RegistData( &t_keyval, "depth2", &t_data, 1 );
244+ i_id = KeyVal_RegistItem( &t_keyval, "depth2", &t_data, 1 );
245245 CU_ASSERT( 2 == i_id );
246246
247247 KEYVAL_DATA_SET_INT(t_data, 3333 );
248248 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
249- i_id = KeyVal_RegistData( &t_keyval, "depth3", &t_data, 2 );
249+ i_id = KeyVal_RegistItem( &t_keyval, "depth3", &t_data, 2 );
250250 CU_ASSERT( 3 == i_id );
251251
252252 KEYVAL_DATA_SET_INT(t_data, 44444 );
253253 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
254- i_id = KeyVal_RegistData( &t_keyval, "depth4", &t_data, 3 );
254+ i_id = KeyVal_RegistItem( &t_keyval, "depth4", &t_data, 3 );
255255 CU_ASSERT( 4 == i_id );
256256
257257 KEYVAL_DATA_SET_INT(t_data, 3 );
258258 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
259- i_id = KeyVal_RegistData( &t_keyval, "depth3", &t_data, KEYVAL_NONEID );
259+ i_id = KeyVal_RegistItem( &t_keyval, "depth3", &t_data, KEYVAL_NONEID );
260260 CU_ASSERT( 5 == i_id );
261261
262262 KEYVAL_DATA_SET_INT(t_data, 33 );
263263 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
264- i_id = KeyVal_RegistData( &t_keyval, "depth3", &t_data, 0 );
264+ i_id = KeyVal_RegistItem( &t_keyval, "depth3", &t_data, 0 );
265265 CU_ASSERT( 6 == i_id );
266266
267267 KEYVAL_DATA_SET_INT(t_data, 333 );
268268 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
269- i_id = KeyVal_RegistData( &t_keyval, "depth3", &t_data, 1 );
269+ i_id = KeyVal_RegistItem( &t_keyval, "depth3", &t_data, 1 );
270270 CU_ASSERT( 7 == i_id );
271271
272272 KEYVAL_DATA_SET_INT(t_data, 33333 );
273273 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
274- i_id = KeyVal_RegistData( &t_keyval, "depth3", &t_data, 3 );
274+ i_id = KeyVal_RegistItem( &t_keyval, "depth3", &t_data, 3 );
275275 CU_ASSERT( 8 == i_id );
276276
277277
@@ -355,7 +355,7 @@ void
355355
356356
357357 // Delete & Check Depth 4 ---
358- i_err = KeyVal_RemoveData( &t_keyval, "depth3", 3 );
358+ i_err = KeyVal_RemoveItem( &t_keyval, "depth3", 3 );
359359 CU_ASSERT( 0x00 == i_err );
360360
361361 p_item = KeyVal_SearchItem( &t_keyval, "depth3", KEYVAL_NONEID );
@@ -383,7 +383,7 @@ void
383383 CU_ASSERT( 44444 == KEYVAL_DATA_INT( p_item->value ) );
384384
385385 // Delete & Check Depth 3 ---
386- i_err = KeyVal_RemoveData( &t_keyval, "depth3", 2 );
386+ i_err = KeyVal_RemoveItem( &t_keyval, "depth3", 2 );
387387 CU_ASSERT( 0x00 == i_err );
388388
389389 p_item = KeyVal_SearchItem( &t_keyval, "depth3", KEYVAL_NONEID );
@@ -407,7 +407,7 @@ void
407407 CU_ASSERT( NULL == p_item );
408408
409409 // Delete & Check Depth 2 ---
410- i_err = KeyVal_RemoveData( &t_keyval, "depth3", 1 );
410+ i_err = KeyVal_RemoveItem( &t_keyval, "depth3", 1 );
411411 CU_ASSERT( 0x00 == i_err );
412412
413413 p_item = KeyVal_SearchItem( &t_keyval, "depth3", KEYVAL_NONEID );
@@ -431,7 +431,7 @@ void
431431 CU_ASSERT( 222 == KEYVAL_DATA_INT( p_item->value ) );
432432
433433 // Delete & Check Depth 1 ---
434- i_err = KeyVal_RemoveData( &t_keyval, "depth3", 0 );
434+ i_err = KeyVal_RemoveItem( &t_keyval, "depth3", 0 );
435435 CU_ASSERT( 0x00 == i_err );
436436
437437 p_item = KeyVal_SearchItem( &t_keyval, "depth3", KEYVAL_NONEID );
@@ -457,7 +457,7 @@ void
457457 CU_ASSERT( IS_KEYVAL_TYPE_INT( p_item->value ) );
458458 CU_ASSERT( 11 == KEYVAL_DATA_INT( p_item->value ) );
459459
460- i_err = KeyVal_RemoveData( &t_keyval, "depth1", 0 );
460+ i_err = KeyVal_RemoveItem( &t_keyval, "depth1", 0 );
461461 CU_ASSERT( 0x00 == i_err );
462462
463463 p_item = KeyVal_SearchItem( &t_keyval, "depth1", 0 );
@@ -466,7 +466,7 @@ void
466466 CU_ASSERT( NULL == p_item );
467467
468468 // Delete & Check Depth 0 ---
469- i_err = KeyVal_RemoveData( &t_keyval, "depth3", KEYVAL_NONEID );
469+ i_err = KeyVal_RemoveItem( &t_keyval, "depth3", KEYVAL_NONEID );
470470 CU_ASSERT( 0x00 == i_err );
471471
472472 p_item = KeyVal_SearchItem( &t_keyval, "depth3", KEYVAL_NONEID );
@@ -485,7 +485,7 @@ void
485485 CU_ASSERT( IS_KEYVAL_TYPE_INT( p_item->value ) );
486486 CU_ASSERT( 0 == KEYVAL_DATA_INT( p_item->value ) );
487487
488- i_err = KeyVal_RemoveData( &t_keyval, "depth0", KEYVAL_NONEID );
488+ i_err = KeyVal_RemoveItem( &t_keyval, "depth0", KEYVAL_NONEID );
489489 CU_ASSERT( 0x00 == i_err );
490490
491491 p_item = KeyVal_SearchItem( &t_keyval, "depth0", KEYVAL_NONEID );
@@ -495,51 +495,51 @@ void
495495 // Phase 2 ----
496496 KEYVAL_DATA_SET_INT(t_data, 0 );
497497 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
498- i_id = KeyVal_RegistData( &t_keyval, "depth0", &t_data, KEYVAL_NONEID );
498+ i_id = KeyVal_RegistItem( &t_keyval, "depth0", &t_data, KEYVAL_NONEID );
499499 CU_ASSERT( 0 == i_id );
500500
501501 KEYVAL_DATA_SET_INT(t_data, 11 );
502502 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
503- i_id = KeyVal_RegistData( &t_keyval, "depth1", &t_data, 0 );
503+ i_id = KeyVal_RegistItem( &t_keyval, "depth1", &t_data, 0 );
504504 CU_ASSERT( 1 == i_id );
505505
506506 KEYVAL_DATA_SET_INT(t_data, 222 );
507507 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
508- i_id = KeyVal_RegistData( &t_keyval, "depth2", &t_data, 1 );
508+ i_id = KeyVal_RegistItem( &t_keyval, "depth2", &t_data, 1 );
509509 CU_ASSERT( 2 == i_id );
510510
511511 KEYVAL_DATA_SET_INT(t_data, 3333 );
512512 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
513- i_id = KeyVal_RegistData( &t_keyval, "depth3", &t_data, 2 );
513+ i_id = KeyVal_RegistItem( &t_keyval, "depth3", &t_data, 2 );
514514 CU_ASSERT( 3 == i_id );
515515
516516 KEYVAL_DATA_SET_INT(t_data, 44444 );
517517 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
518- i_id = KeyVal_RegistData( &t_keyval, "depth4", &t_data, 3 );
518+ i_id = KeyVal_RegistItem( &t_keyval, "depth4", &t_data, 3 );
519519 CU_ASSERT( 4 == i_id );
520520
521521 KEYVAL_DATA_SET_INT(t_data, 3 );
522522 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
523- i_id = KeyVal_RegistData( &t_keyval, "depth3", &t_data, KEYVAL_NONEID );
523+ i_id = KeyVal_RegistItem( &t_keyval, "depth3", &t_data, KEYVAL_NONEID );
524524 CU_ASSERT( 5 == i_id );
525525
526526 KEYVAL_DATA_SET_INT(t_data, 33 );
527527 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
528- i_id = KeyVal_RegistData( &t_keyval, "depth3", &t_data, 0 );
528+ i_id = KeyVal_RegistItem( &t_keyval, "depth3", &t_data, 0 );
529529 CU_ASSERT( 6 == i_id );
530530
531531 KEYVAL_DATA_SET_INT(t_data, 333 );
532532 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
533- i_id = KeyVal_RegistData( &t_keyval, "depth3", &t_data, 1 );
533+ i_id = KeyVal_RegistItem( &t_keyval, "depth3", &t_data, 1 );
534534 CU_ASSERT( 7 == i_id );
535535
536536 KEYVAL_DATA_SET_INT(t_data, 33333 );
537537 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
538- i_id = KeyVal_RegistData( &t_keyval, "depth3", &t_data, 3 );
538+ i_id = KeyVal_RegistItem( &t_keyval, "depth3", &t_data, 3 );
539539 CU_ASSERT( 8 == i_id );
540540
541541
542- i_err = KeyVal_RemoveData( &t_keyval, "depth0", KEYVAL_NONEID );
542+ i_err = KeyVal_RemoveItem( &t_keyval, "depth0", KEYVAL_NONEID );
543543 CU_ASSERT( 0x00 == i_err );
544544
545545 // Check Depth 0 ---
@@ -608,37 +608,37 @@ void
608608 // Phase 3 ----
609609 KEYVAL_DATA_SET_INT(t_data, 0 );
610610 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
611- i_id = KeyVal_RegistData( &t_keyval, "depth0", &t_data, KEYVAL_NONEID );
611+ i_id = KeyVal_RegistItem( &t_keyval, "depth0", &t_data, KEYVAL_NONEID );
612612 CU_ASSERT( 0 == i_id );
613613
614614 KEYVAL_DATA_SET_INT(t_data, 11 );
615615 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
616- i_id = KeyVal_RegistData( &t_keyval, "depth1", &t_data, 0 );
616+ i_id = KeyVal_RegistItem( &t_keyval, "depth1", &t_data, 0 );
617617 CU_ASSERT( 1 == i_id );
618618
619619 KEYVAL_DATA_SET_INT(t_data, 222 );
620620 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
621- i_id = KeyVal_RegistData( &t_keyval, "depth2", &t_data, 1 );
621+ i_id = KeyVal_RegistItem( &t_keyval, "depth2", &t_data, 1 );
622622 CU_ASSERT( 2 == i_id );
623623
624624 KEYVAL_DATA_SET_INT(t_data, 3333 );
625625 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
626- i_id = KeyVal_RegistData( &t_keyval, "depth3", &t_data, 2 );
626+ i_id = KeyVal_RegistItem( &t_keyval, "depth3", &t_data, 2 );
627627 CU_ASSERT( 3 == i_id );
628628
629629 KEYVAL_DATA_SET_INT(t_data, 44444 );
630630 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
631- i_id = KeyVal_RegistData( &t_keyval, "depth4", &t_data, 3 );
631+ i_id = KeyVal_RegistItem( &t_keyval, "depth4", &t_data, 3 );
632632 CU_ASSERT( 4 == i_id );
633633
634634 KEYVAL_DATA_SET_INT(t_data, 3 );
635635 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
636- i_id = KeyVal_RegistData( &t_keyval, "depth3", &t_data, KEYVAL_NONEID );
636+ i_id = KeyVal_RegistItem( &t_keyval, "depth3", &t_data, KEYVAL_NONEID );
637637 CU_ASSERT( 5 == i_id );
638638
639639 KEYVAL_DATA_SET_INT(t_data, 33 );
640640 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
641- i_id = KeyVal_RegistData( &t_keyval, "depth3", &t_data, 0 );
641+ i_id = KeyVal_RegistItem( &t_keyval, "depth3", &t_data, 0 );
642642 CU_ASSERT( 6 == i_id );
643643
644644
@@ -654,9 +654,9 @@ void
654654
655655 /* ===========================================================================*/
656656 void
657- Test_KeyVal_RegistData_003( void ) {
657+ Test_KeyVal_RegistItem_003( void ) {
658658
659- // for RegistData / SearchItem / RemoveData DataType Variation Test ---
659+ // for RegistItem / SearchItem / RemoveItem DataType Variation Test ---
660660
661661 int i_id;
662662 int i_err;
@@ -675,33 +675,33 @@ void
675675 // Phase 1 ----
676676 KEYVAL_DATA_SET_INT(t_data, 12345678 );
677677 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
678- i_id = KeyVal_RegistData( &t_keyval, "int0", &t_data, KEYVAL_NONEID );
678+ i_id = KeyVal_RegistItem( &t_keyval, "int0", &t_data, KEYVAL_NONEID );
679679 CU_ASSERT( KEYVAL_NONEID < i_id );
680680
681681 KEYVAL_DATA_SET_DWORD(t_data, 0xdeadbeaf );
682682 CU_ASSERT( IS_KEYVAL_TYPE_DWORD( t_data ));
683- i_id = KeyVal_RegistData( &t_keyval, "dword0", &t_data, KEYVAL_NONEID );
683+ i_id = KeyVal_RegistItem( &t_keyval, "dword0", &t_data, KEYVAL_NONEID );
684684 CU_ASSERT( KEYVAL_NONEID < i_id );
685685
686686 KEYVAL_DATA_SET_STRING(t_data, "deadbeaf" );
687687 CU_ASSERT( IS_KEYVAL_TYPE_STRING( t_data ));
688- i_id = KeyVal_RegistData( &t_keyval, "string0", &t_data, KEYVAL_NONEID );
688+ i_id = KeyVal_RegistItem( &t_keyval, "string0", &t_data, KEYVAL_NONEID );
689689 CU_ASSERT( KEYVAL_NONEID < i_id );
690690
691691 strncpy( str_temp, "DEADBEAF", 256 );
692692 KEYVAL_DATA_SET_STRPTR(t_data, str_temp );
693693 CU_ASSERT( IS_KEYVAL_TYPE_STRPTR( t_data ));
694- i_id = KeyVal_RegistData( &t_keyval, "strptr0", &t_data, KEYVAL_NONEID );
694+ i_id = KeyVal_RegistItem( &t_keyval, "strptr0", &t_data, KEYVAL_NONEID );
695695 CU_ASSERT( KEYVAL_NONEID < i_id );
696696
697697 KEYVAL_DATA_SET_BOOL_TRUE(t_data);
698698 CU_ASSERT( IS_KEYVAL_TYPE_BOOL( t_data ));
699- i_id = KeyVal_RegistData( &t_keyval, "bool0", &t_data, KEYVAL_NONEID );
699+ i_id = KeyVal_RegistItem( &t_keyval, "bool0", &t_data, KEYVAL_NONEID );
700700 CU_ASSERT( KEYVAL_NONEID < i_id );
701701
702702 KEYVAL_DATA_SET_BYTE(t_data, 0xfe);
703703 CU_ASSERT( IS_KEYVAL_TYPE_BYTE( t_data ));
704- i_id = KeyVal_RegistData( &t_keyval, "byte0", &t_data, KEYVAL_NONEID );
704+ i_id = KeyVal_RegistItem( &t_keyval, "byte0", &t_data, KEYVAL_NONEID );
705705 CU_ASSERT( KEYVAL_NONEID < i_id );
706706
707707
@@ -736,22 +736,22 @@ void
736736 CU_ASSERT( 0xfe == KEYVAL_DATA_BYTE( p_item->value ) );
737737
738738
739- i_err = KeyVal_RemoveData( &t_keyval, "int0", KEYVAL_NONEID );
739+ i_err = KeyVal_RemoveItem( &t_keyval, "int0", KEYVAL_NONEID );
740740 CU_ASSERT( 0x00 == i_err );
741741
742- i_err = KeyVal_RemoveData( &t_keyval, "dword0", KEYVAL_NONEID );
742+ i_err = KeyVal_RemoveItem( &t_keyval, "dword0", KEYVAL_NONEID );
743743 CU_ASSERT( 0x00 == i_err );
744744
745- i_err = KeyVal_RemoveData( &t_keyval, "string0", KEYVAL_NONEID );
745+ i_err = KeyVal_RemoveItem( &t_keyval, "string0", KEYVAL_NONEID );
746746 CU_ASSERT( 0x00 == i_err );
747747
748- i_err = KeyVal_RemoveData( &t_keyval, "strptr0", KEYVAL_NONEID );
748+ i_err = KeyVal_RemoveItem( &t_keyval, "strptr0", KEYVAL_NONEID );
749749 CU_ASSERT( 0x00 == i_err );
750750
751- i_err = KeyVal_RemoveData( &t_keyval, "bool0", KEYVAL_NONEID );
751+ i_err = KeyVal_RemoveItem( &t_keyval, "bool0", KEYVAL_NONEID );
752752 CU_ASSERT( 0x00 == i_err );
753753
754- i_err = KeyVal_RemoveData( &t_keyval, "byte0", KEYVAL_NONEID );
754+ i_err = KeyVal_RemoveItem( &t_keyval, "byte0", KEYVAL_NONEID );
755755 CU_ASSERT( 0x00 == i_err );
756756
757757
@@ -786,9 +786,9 @@ void
786786
787787 /* ===========================================================================*/
788788 void
789- Test_KeyVal_RegistData_004( void ) {
789+ Test_KeyVal_RegistItem_004( void ) {
790790
791- // for RegistData / SearchItem / RemoveData Item Limit Extension Test ---
791+ // for RegistItem / SearchItem / RemoveItem Item Limit Extension Test ---
792792
793793 int i_id;
794794 int i_err;
@@ -814,7 +814,7 @@ void
814814
815815 KEYVAL_DATA_SET_INT(t_data, i_cnt );
816816 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
817- i_id = KeyVal_RegistData( &t_keyval, str_key, &t_data, KEYVAL_NONEID );
817+ i_id = KeyVal_RegistItem( &t_keyval, str_key, &t_data, KEYVAL_NONEID );
818818 CU_ASSERT( i_cnt == i_id );
819819 }
820820
@@ -830,7 +830,7 @@ void
830830 for( i_cnt = KEYVAL_DEFAULT_ALLOCS; i_cnt <(KEYVAL_DEFAULT_ALLOCS * 3); i_cnt++ ) {
831831 snprintf( str_key, 64, "extend%05d", i_cnt );
832832
833- i_err = KeyVal_RemoveData( &t_keyval, str_key, KEYVAL_NONEID );
833+ i_err = KeyVal_RemoveItem( &t_keyval, str_key, KEYVAL_NONEID );
834834 CU_ASSERT( 0x00 == i_err );
835835
836836 p_item = KeyVal_SearchItem( &t_keyval, str_key, KEYVAL_NONEID );
@@ -845,14 +845,14 @@ void
845845
846846 KEYVAL_DATA_SET_INT(t_data, i_cnt );
847847 CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
848- i_id = KeyVal_RegistData( &t_keyval, str_key, &t_data, KEYVAL_NONEID );
848+ i_id = KeyVal_RegistItem( &t_keyval, str_key, &t_data, KEYVAL_NONEID );
849849 CU_ASSERT( i_cnt == i_id );
850850 }
851851
852852 for( i_cnt = (KEYVAL_DEFAULT_ALLOCS * 4) - 1; 0 <= i_cnt; i_cnt-- ) {
853853 snprintf( str_key, 64, "extend%05d", i_cnt );
854854
855- i_err = KeyVal_RemoveData( &t_keyval, str_key, KEYVAL_NONEID );
855+ i_err = KeyVal_RemoveItem( &t_keyval, str_key, KEYVAL_NONEID );
856856 CU_ASSERT( 0x00 == i_err );
857857
858858 p_item = KeyVal_SearchItem( &t_keyval, str_key, KEYVAL_NONEID );
@@ -871,6 +871,136 @@ void
871871 }
872872
873873 /* ===========================================================================*/
874+void
875+ Test_KeyVal_SetGetData_001( void ) {
876+
877+ // for RegistItem / SearchItem / RemoveItem Item Limit Extension Test ---
878+
879+ int i_id;
880+ int i_err;
881+ KeyVal_Info t_keyval;
882+ KeyVal_Data t_data;
883+ KeyVal_Data *p_data;
884+ KeyVal_Item *p_item;
885+ char str_key[64];
886+ int i_cnt;
887+
888+ i_err = KeyVal_Init( &t_keyval, 0 );
889+ CU_ASSERT( 0x00 == i_err );
890+
891+ CU_ASSERT( KEYVAL_DEFAULT_ALLOCS == t_keyval.i_allocs );
892+ CU_ASSERT( 0 == t_keyval.i_used );
893+ CU_ASSERT( NULL != t_keyval.p_items );
894+
895+ // Phase 1 ----
896+ KEYVAL_DATA_SET_INT(t_data, 1234 );
897+ CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
898+ i_id = KeyVal_SetData( &t_keyval, "int0", &t_data );
899+ CU_ASSERT( KEYVAL_NONEID < i_id );
900+
901+ memset( &t_data, 0x00, sizeof( KeyVal_Data ) );
902+
903+ i_err = KeyVal_GetData( &t_data, &t_keyval, "int0" );
904+ CU_ASSERT( 0x00 == i_err );
905+ CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ) );
906+ CU_ASSERT( 1234 == KEYVAL_DATA_INT( t_data ) );
907+
908+ i_err = KeyVal_DeleteData( &t_keyval, "int0" );
909+ CU_ASSERT( 0x00 == i_err );
910+
911+ // Phase 2 ----
912+ KEYVAL_DATA_SET_INT(t_data, 4321 );
913+ CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
914+ i_id = KeyVal_SetData( &t_keyval, "depth0/level1/layer2/int3", &t_data );
915+ CU_ASSERT( KEYVAL_NONEID < i_id );
916+
917+ memset( &t_data, 0x00, sizeof( KeyVal_Data ) );
918+
919+ i_err = KeyVal_GetData( &t_data, &t_keyval, "depth0/level1/layer2/int3" );
920+ CU_ASSERT( 0x00 == i_err );
921+ CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ) );
922+ CU_ASSERT( 4321 == KEYVAL_DATA_INT( t_data ) );
923+
924+ i_err = KeyVal_DeleteData( &t_keyval, "depth0/level1/layer2/int3" );
925+ CU_ASSERT( 0x00 == i_err );
926+
927+ // Phase 3 ----
928+ KEYVAL_DATA_SET_INT(t_data, 87654321 );
929+ CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
930+ i_id = KeyVal_SetData( &t_keyval, "depth0/level1/layer2/int3", &t_data );
931+ CU_ASSERT( KEYVAL_NONEID < i_id );
932+
933+ memset( &t_data, 0x00, sizeof( KeyVal_Data ) );
934+
935+ KEYVAL_DATA_SET_INT(t_data, 1234 );
936+ CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
937+ i_id = KeyVal_SetData( &t_keyval, "depth0/level1", &t_data );
938+ CU_ASSERT( KEYVAL_NONEID < i_id );
939+
940+ memset( &t_data, 0x00, sizeof( KeyVal_Data ) );
941+
942+ i_err = KeyVal_GetData( &t_data, &t_keyval, "depth0/level1" );
943+ CU_ASSERT( 0x00 == i_err );
944+ CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ) );
945+ CU_ASSERT( 1234 == KEYVAL_DATA_INT( t_data ) );
946+
947+ i_err = KeyVal_GetData( &t_data, &t_keyval, "depth0/level1/layer2/int3" );
948+ CU_ASSERT( 0x00 == i_err );
949+ CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ) );
950+ CU_ASSERT( 87654321 == KEYVAL_DATA_INT( t_data ) );
951+
952+ i_err = KeyVal_DeleteData( &t_keyval, "depth0/level1/layer2" );
953+ CU_ASSERT( 0x00 == i_err );
954+
955+ i_err = KeyVal_GetData( &t_data, &t_keyval, "depth0/level1/layer2/int3" );
956+ CU_ASSERT( 0x00 != i_err );
957+ i_err = KeyVal_GetData( &t_data, &t_keyval, "depth0/level1/layer2" );
958+ CU_ASSERT( 0x00 != i_err );
959+ i_err = KeyVal_GetData( &t_data, &t_keyval, "depth0/level1" );
960+ CU_ASSERT( 0x00 == i_err );
961+ CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ) );
962+ CU_ASSERT( 1234 == KEYVAL_DATA_INT( t_data ) );
963+
964+ KEYVAL_DATA_SET_INT(t_data, 87654321 );
965+ CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ));
966+ i_id = KeyVal_SetData( &t_keyval, "depth0/level1/layer2", &t_data );
967+ CU_ASSERT( KEYVAL_NONEID < i_id );
968+
969+ memset( &t_data, 0x00, sizeof( KeyVal_Data ) );
970+
971+ i_err = KeyVal_GetData( &t_data, &t_keyval, "depth0/level1/layer2/int3" );
972+ CU_ASSERT( 0x00 != i_err );
973+ i_err = KeyVal_GetData( &t_data, &t_keyval, "depth0/level1/layer2" );
974+ CU_ASSERT( 0x00 == i_err );
975+ CU_ASSERT( IS_KEYVAL_TYPE_INT( t_data ) );
976+ CU_ASSERT( 87654321 == KEYVAL_DATA_INT( t_data ) );
977+
978+ i_err = KeyVal_DeleteData( &t_keyval, "depth0" );
979+ CU_ASSERT( 0x00 == i_err );
980+
981+ i_err = KeyVal_GetData( &t_data, &t_keyval, "depth0/level1/layer2/int3" );
982+ CU_ASSERT( 0x00 != i_err );
983+ i_err = KeyVal_GetData( &t_data, &t_keyval, "depth0/level1/layer2" );
984+ CU_ASSERT( 0x00 != i_err );
985+ i_err = KeyVal_GetData( &t_data, &t_keyval, "depth0/level1" );
986+ CU_ASSERT( 0x00 != i_err );
987+ i_err = KeyVal_GetData( &t_data, &t_keyval, "depth0" );
988+ CU_ASSERT( 0x00 != i_err );
989+
990+ i_err = KeyVal_Term( &t_keyval );
991+ CU_ASSERT( 0x00 == i_err );
992+
993+ i_err = KeyVal_GetData( &t_data, &t_keyval, "int0" );
994+ CU_ASSERT( -0x03 == i_err );
995+
996+ CU_ASSERT( 0 == t_keyval.i_allocs );
997+ CU_ASSERT( 0 == t_keyval.i_used );
998+ CU_ASSERT( NULL == t_keyval.p_items );
999+
1000+ return;
1001+}
1002+
1003+/* ===========================================================================*/
8741004 VMTUI_TEST_KEYVAL_EXTERN
8751005 int
8761006 Test_KeyVal(
@@ -881,10 +1011,12 @@ int
8811011 pt_keyval = CU_add_suite( "VMTUI_KeyVal", NULL, NULL );
8821012
8831013 CU_add_test( pt_keyval, "VMTUI_KeyVal_InitTerm_001", Test_KeyVal_InitTerm_001 );
884- CU_add_test( pt_keyval, "VMTUI_KeyVal_RegistData_001", Test_KeyVal_RegistData_001 );
885- CU_add_test( pt_keyval, "VMTUI_KeyVal_RegistData_002", Test_KeyVal_RegistData_002 );
886- CU_add_test( pt_keyval, "VMTUI_KeyVal_RegistData_003", Test_KeyVal_RegistData_003 );
887- CU_add_test( pt_keyval, "VMTUI_KeyVal_RegistData_004", Test_KeyVal_RegistData_004 );
1014+ CU_add_test( pt_keyval, "VMTUI_KeyVal_RegistItem_001", Test_KeyVal_RegistItem_001 );
1015+ CU_add_test( pt_keyval, "VMTUI_KeyVal_RegistItem_002", Test_KeyVal_RegistItem_002 );
1016+ CU_add_test( pt_keyval, "VMTUI_KeyVal_RegistItem_003", Test_KeyVal_RegistItem_003 );
1017+ CU_add_test( pt_keyval, "VMTUI_KeyVal_RegistItem_004", Test_KeyVal_RegistItem_004 );
1018+
1019+ CU_add_test( pt_keyval, "VMTUI_KeyVal_SetGetData_001", Test_KeyVal_SetGetData_001 );
8881020
8891021 return 0x00;
8901022 }