correction of kvpb_next for msc51, declaration without first handler

diff --git a/libs4c/keyval/keyvalpb.c b/libs4c/keyval/keyvalpb.c
index d2d67502a8051c861c50bae71ea29dcea60d25d0..8dd6d1e84952e2863e22f513756619e506a43521 100644 (file)
--- a/libs4c/keyval/keyvalpb.c
+++ b/libs4c/keyval/keyvalpb.c
@@ -242,6 +242,7 @@ KVPB_DPTRTYPE kvpb_key_t *__kvpb_first(uint8_t mode)
   return key->size!=KVPB_EMPTY?key:NULL;
 }
 
+#ifndef KVPB_WITHOUT_HADLE
 /**
  * kvpb_next - Iterate to the next consecutive key-value pair
  * @kvpb_block: Pointer to the KVPB access information/state structure
@@ -252,11 +253,14 @@ KVPB_DPTRTYPE kvpb_key_t *__kvpb_first(uint8_t mode)
  * File: keyvalpb.c
  */
 KVPB_DPTRTYPE kvpb_key_t *kvpb_next(kvpb_block_t *kvpb_block, KVPB_DPTRTYPE kvpb_key_t *key)
+#else
+KVPB_DPTRTYPE kvpb_key_t *__kvpb_next(KVPB_DPTRTYPE kvpb_key_t *key)
+#endif
 {
   do {
     key=(KVPB_DPTRTYPE kvpb_key_t *)((KVPB_DPTRTYPE uint8_t *)key+
-                               kvpb_chunk_align(kvpb_block,key->size+sizeof(kvpb_key_t)+
-                               (kvpb_block->flags&KVPB_DESC_CHUNKWO?kvpb_chunk_size(kvpb_block):0)));
+                               kvpb_chunk_align(kvpb_block,key->size+sizeof(kvpb_key_t))+
+                               (kvpb_block->flags&KVPB_DESC_CHUNKWO?kvpb_chunk_size(kvpb_block):0));
     if (key->size==KVPB_EMPTY) return NULL;
   } while(*kvpb_keyid_valid(kvpb_block,key)==KVPB_KEYID_INVALID);
   return key;