[svn-r9593] Purpose:

    Bug fix

Description:
    Re-work array of 'forward' pointers in a way that makes the PGI compiler
more happy.

Solution:
    Change from 'H5SL_node_t *forward[1]' to 'H5SL_node_t **forward' and
change how array of forward pointers is dealt with.

Platforms tested:
    Linux 2.4 (verbena) w/PGI
    FreeBSD 4.10 (sleipnir)
    Configuration not tested w/h5committest

1 files changed, 4 insertions, 2 deletions

diff --git a/src/H5SL.c b/src/H5SL.c
index 9f1f4a6..1382f21 100644
--- a/src/H5SL.c
+++ b/src/H5SL.c
@@ -114,7 +114,7 @@ struct H5SL_node_t {
     void *key;                          /* Pointer to node's key */
     void *item;                         /* Pointer to node's item */
     size_t level;                       /* The level of this node */
-    struct H5SL_node_t *forward[1];     /* Array of forward pointers from this node */
+    struct H5SL_node_t **forward;       /* Array of forward pointers from this node */
 };
 
 /* Main skip list data structure */
@@ -250,13 +250,14 @@ H5SL_new_node(size_t lvl, void *item, void *key)
     FUNC_ENTER_NOAPI_NOINIT(H5SL_new_node);
 
     /* Allocate the node */
-    if((ret_value=H5MM_malloc(sizeof(H5SL_node_t)+(sizeof(H5SL_node_t *)*lvl)))==NULL)
+    if((ret_value=H5MM_malloc(sizeof(H5SL_node_t)+(sizeof(H5SL_node_t *)*(lvl+1))))==NULL)
         HGOTO_ERROR(H5E_SLIST,H5E_NOSPACE,NULL,"memory allocation failed");
 
     /* Initialize node */
     ret_value->key=key;
     ret_value->item=item;
     ret_value->level=lvl;
+    ret_value->forward=(H5SL_node_t **)((unsigned char *)ret_value+sizeof(H5SL_node_t));
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -301,6 +302,7 @@ H5SL_create(H5SL_type_t type, double p, size_t max_level)
 
     /* Set the static internal fields */
     new_slist->type=type;
+    new_slist->p=p;
     new_slist->p1=p*RAND_MAX;
     new_slist->max_level=max_level;