Add property "keys" for hashtable_get_string (return string with list of keys)

doc/en/weechat_plugin_api.en.txt

@@ -3092,16 +3092,20 @@ Arguments:
 *** 'pointer': pointer
 *** 'buffer': buffer
 *** 'time': time
+** 'keys': string with list of keys (format: "key1,key2,key3")
 
 Return value:
 
 * string value of property
 
-C example:
+C examples:
 
 [source,C]
 ----------------------------------------
-const char *type_keys = weechat_hashtable_get_string (hashtable, "type_keys");
+weechat_printf (NULL, "keys are type: %s",
+                weechat_hashtable_get_string (hashtable, "type_keys"));
+weechat_printf (NULL, "list of keys: %s",
+                weechat_hashtable_get_string (hashtable, "keys"));
 ----------------------------------------
 
 [NOTE]

doc/fr/weechat_plugin_api.fr.txt

@@ -3123,16 +3123,20 @@ Arguments:
 *** 'pointer' : pointeur
 *** 'buffer' : buffer
 *** 'time' : heure
+** 'keys': chaîne avec la liste des clés (format: "clé1,clé2,clé3")
 
 Valeur en retour :
 
 * valeur de la propriété sous forme de chaîne
 
-Exemple en C :
+Exemples en C :
 
 [source,C]
 ----------------------------------------
-const char *type_keys = weechat_hashtable_get_string (hashtable, "type_keys");
+weechat_printf (NULL, "les clés sont de type: %s",
+                weechat_hashtable_get_string (hashtable, "type_keys"));
+weechat_printf (NULL, "liste des clés: %s",
+                weechat_hashtable_get_string (hashtable, "keys"));
 ----------------------------------------
 
 [NOTE]

doc/it/weechat_plugin_api.it.txt

@@ -3109,6 +3109,7 @@ const char *weechat_hashtable_get_string (struct t_hashtable *hashtable,
                                           void *property);
 ----------------------------------------
 
+// TRANSLATION MISSING
 Arguments:
 
 * 'hashtable': hashtable pointer
@@ -3125,6 +3126,7 @@ Arguments:
 *** 'pointer': pointer
 *** 'buffer': buffer
 *** 'time': time
+** 'keys': string with list of keys (format: "key1,key2,key3")
 
 Return value:
 
@@ -3134,7 +3136,10 @@ Esempio in C:
 
 [source,C]
 ----------------------------------------
-const char *type_keys = weechat_hashtable_get_string (hashtable, "type_keys");
+weechat_printf (NULL, "keys are type: %s",
+                weechat_hashtable_get_string (hashtable, "type_keys"));
+weechat_printf (NULL, "list of keys: %s",
+                weechat_hashtable_get_string (hashtable, "keys"));
 ----------------------------------------
 
 [NOTE]

src/core/wee-hashtable.c

@@ -128,6 +128,7 @@ hashtable_new (int size,
         new_hashtable->type_keys = type_keys_int;
         new_hashtable->type_values = type_values_int;
         new_hashtable->htable = malloc (size * sizeof (*(new_hashtable->htable)));
+        new_hashtable->keys = NULL;
         if (!new_hashtable->htable)
         {
             free (new_hashtable);
@@ -419,6 +420,112 @@ hashtable_get_integer (struct t_hashtable *hashtable, const char *property)
     return 0;
 }
 
+/*
+ * hashtable_get_keys_compute_length_cb: compute length of all keys
+ */
+
+void
+hashtable_get_keys_compute_length_cb (void *data,
+                                      struct t_hashtable *hashtable,
+                                      const void *key, const void *value)
+{
+    char str_int[64];
+    int *length;
+    
+    /* make C compiler happy */
+    (void) value;
+    
+    length = (int *)data;
+    
+    switch (hashtable->type_keys)
+    {
+        case HASHTABLE_INTEGER:
+            snprintf (str_int, sizeof (str_int), "%d", *((int *)key));
+            *length += strlen (str_int) + 1;
+            break;
+        case HASHTABLE_STRING:
+            *length += strlen ((char *)key) + 1;
+            break;
+        case HASHTABLE_POINTER:
+        case HASHTABLE_BUFFER:
+        case HASHTABLE_TIME:
+        case HASHTABLE_NUM_TYPES:
+            break;
+    }
+}
+
+/*
+ * hashtable_get_keys_build_string_cb: build string with all keys
+ */
+
+void
+hashtable_get_keys_build_string_cb (void *data,
+                                    struct t_hashtable *hashtable,
+                                    const void *key, const void *value)
+{
+    char str_int[64];
+    char *keys;
+    
+    /* make C compiler happy */
+    (void) value;
+    
+    keys = (char *)data;
+    
+    if (keys[0])
+        strcat (keys, ",");
+    
+    switch (hashtable->type_keys)
+    {
+        case HASHTABLE_INTEGER:
+            snprintf (str_int, sizeof (str_int), "%d", *((int *)key));
+            strcat (keys, str_int);
+            break;
+        case HASHTABLE_STRING:
+            strcat (keys, (char *)key);
+            break;
+        case HASHTABLE_POINTER:
+        case HASHTABLE_BUFFER:
+        case HASHTABLE_TIME:
+        case HASHTABLE_NUM_TYPES:
+            break;
+    }
+}
+
+/*
+ * hashtable_get_keys: get keys of hashtable as string
+ *                     string has format: "key1,key2,key3"
+ *                     Note: this works only if keys have type "integer",
+ *                           or "string"
+ */
+
+const char *
+hashtable_get_keys (struct t_hashtable *hashtable)
+{
+    int length;
+    
+    if (hashtable->keys)
+    {
+        free (hashtable->keys);
+        hashtable->keys = NULL;
+    }
+    
+    /* first compute length of string */
+    length = 0;
+    hashtable_map (hashtable, &hashtable_get_keys_compute_length_cb, &length);
+    if (length == 0)
+        return hashtable->keys;
+    
+    /* build string */
+    hashtable->keys = malloc (length + 1);
+    if (!hashtable->keys)
+        return NULL;
+    hashtable->keys[0] = '\0';
+    hashtable_map (hashtable, &hashtable_get_keys_build_string_cb,
+                   hashtable->keys);
+    
+    return hashtable->keys;
+}
+
 /*
  * hashtable_get_string: get a hashtable property as string
  */
@@ -432,6 +539,8 @@ hashtable_get_string (struct t_hashtable *hashtable, const char *property)
             return hashtable_type_string[hashtable->type_keys];
         else if (string_strcasecmp (property, "type_values") == 0)
             return hashtable_type_string[hashtable->type_values];
+        else if (string_strcasecmp (property, "keys") == 0)
+            return hashtable_get_keys (hashtable);
     }
     
     return NULL;
@@ -585,6 +694,8 @@ hashtable_free (struct t_hashtable *hashtable)
     
     hashtable_remove_all (hashtable);
     free (hashtable->htable);
+    if (hashtable->keys)
+        free (hashtable->keys);
     free (hashtable);
 }
 
@@ -665,4 +776,5 @@ hashtable_print_log (struct t_hashtable *hashtable, const char *name)
             log_printf ("      next_item. . . . . : 0x%lx", ptr_item->next_item);
         }
     }
+    log_printf ("  keys . . . . . . . . . : '%s'", hashtable->keys);
 }

src/core/wee-hashtable.h

@@ -91,12 +91,15 @@ struct t_hashtable
     int items_count;                   /* number of items in hashtable      */
     
     /* type for keys and values */
-    enum t_hashtable_type type_keys;    /* type for keys: int/str/pointer   */
-    enum t_hashtable_type type_values;  /* type for values: int/str/pointer */
+    enum t_hashtable_type type_keys;   /* type for keys: int/str/pointer    */
+    enum t_hashtable_type type_values; /* type for values: int/str/pointer  */
     
     /* callbacks */
     t_hashtable_hash_key *callback_hash_key; /* hash key to integer value   */
     t_hashtable_keycmp *callback_keycmp;     /* compare two keys            */
+
+    /* keys */
+    char *keys;                        /* keys list (NULL if never asked)   */
 };
 
 extern struct t_hashtable *hashtable_new (int size,