pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-09 11:13:12 +02:00
Code Activity

Add properties "values" and "keys_values" for hashtable_get_string (return string with list of values or keys/values)

Browse Source
This commit is contained in:
Sebastien Helleu
2010-10-15 23:48:45 +02:00
parent 79c8c90256
commit 9186a5b7e3
5 changed files with 202 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/en/weechat_plugin_api.en.txt
+3
View File
@@ -3130,6 +3130,9 @@ Arguments:
*** 'buffer': buffer
*** 'time': time
** 'keys': string with list of keys (format: "key1,key2,key3")
** 'values': string with list of values (format: "value1,value2,value3")
** 'keys_values': string with list of keys and values
(format: "key1:value1,key2:value2,key3:value3")
Return value:
doc/fr/weechat_plugin_api.fr.txt
+3
View File
@@ -3161,6 +3161,9 @@ Arguments:
*** 'buffer' : buffer
*** 'time' : heure
** 'keys': chaîne avec la liste des clés (format: "clé1,clé2,clé3")
** 'values': chaîne avec la liste des valeurs (format: "valeur1,valeur2,valeur3")
** 'keys_values': chaîne avec la liste des clés et valeurs
(format: "clé1:valeur1,clé2:valeur2,clé3:valeur3")
Valeur en retour :
doc/it/weechat_plugin_api.it.txt
+3
View File
@@ -3167,6 +3167,9 @@ Arguments:
*** 'buffer': buffer
*** 'time': time
** 'keys': string with list of keys (format: "key1,key2,key3")
** 'values': string with list of values (format: "value1,value2,value3")
** 'keys_values': string with list of keys and values
(format: "key1:value1,key2:value2,key3:value3")
Return value:
src/core/wee-hashtable.c
+190 -37
View File
@@ -128,7 +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;
new_hashtable->keys_values = NULL;
if (!new_hashtable->htable)
{
free (new_hashtable);
@@ -431,13 +431,13 @@ hashtable_get_integer (struct t_hashtable *hashtable, const char *property)
}
/*
* hashtable_get_keys_compute_length_cb: compute length of all keys
* hashtable_compute_length_keys_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)
hashtable_compute_length_keys_cb (void *data,
struct t_hashtable *hashtable,
const void *key, const void *value)
{
char str_int[64];
int *length;
@@ -465,33 +465,30 @@ hashtable_get_keys_compute_length_cb (void *data,
}
/*
* hashtable_get_keys_build_string_cb: build string with all keys
* hashtable_compute_length_values_cb: compute length of all values
*/
void
hashtable_get_keys_build_string_cb (void *data,
hashtable_compute_length_values_cb (void *data,
struct t_hashtable *hashtable,
const void *key, const void *value)
{
char str_int[64];
char *keys;
int *length;
/* make C compiler happy */
(void) value;
(void) key;
keys = (char *)data;
length = (int *)data;
if (keys[0])
strcat (keys, ",");
switch (hashtable->type_keys)
switch (hashtable->type_values)
{
case HASHTABLE_INTEGER:
snprintf (str_int, sizeof (str_int), "%d", *((int *)key));
strcat (keys, str_int);
snprintf (str_int, sizeof (str_int), "%d", *((int *)value));
*length += strlen (str_int) + 1;
break;
case HASHTABLE_STRING:
strcat (keys, (char *)key);
*length += strlen ((char *)value) + 1;
break;
case HASHTABLE_POINTER:
case HASHTABLE_BUFFER:
@@ -502,38 +499,190 @@ hashtable_get_keys_build_string_cb (void *data,
}
/*
* 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"
* hashtable_compute_length_keys_values_cb: compute length of all keys + values
*/
void
hashtable_compute_length_keys_values_cb (void *data,
struct t_hashtable *hashtable,
const void *key, const void *value)
{
hashtable_compute_length_keys_cb (data, hashtable, key, value);
hashtable_compute_length_values_cb (data, hashtable, key, value);
}
/*
* hashtable_build_string_keys_cb: build string with all keys
*/
void
hashtable_build_string_keys_cb (void *data,
struct t_hashtable *hashtable,
const void *key, const void *value)
{
char str_int[64];
char *str;
/* make C compiler happy */
(void) value;
str = (char *)data;
if (str[0])
strcat (str, ",");
switch (hashtable->type_keys)
{
case HASHTABLE_INTEGER:
snprintf (str_int, sizeof (str_int), "%d", *((int *)key));
strcat (str, str_int);
break;
case HASHTABLE_STRING:
strcat (str, (char *)key);
break;
case HASHTABLE_POINTER:
case HASHTABLE_BUFFER:
case HASHTABLE_TIME:
case HASHTABLE_NUM_TYPES:
break;
}
}
/*
* hashtable_build_string_values_cb: build string with all values
*/
void
hashtable_build_string_values_cb (void *data,
struct t_hashtable *hashtable,
const void *key, const void *value)
{
char str_int[64];
char *str;
/* make C compiler happy */
(void) key;
str = (char *)data;
if (str[0])
strcat (str, ",");
switch (hashtable->type_values)
{
case HASHTABLE_INTEGER:
snprintf (str_int, sizeof (str_int), "%d", *((int *)value));
strcat (str, str_int);
break;
case HASHTABLE_STRING:
strcat (str, (char *)value);
break;
case HASHTABLE_POINTER:
case HASHTABLE_BUFFER:
case HASHTABLE_TIME:
case HASHTABLE_NUM_TYPES:
break;
}
}
/*
* hashtable_build_string_keys_values_cb: build string with all keys + values
*/
void
hashtable_build_string_keys_values_cb (void *data,
struct t_hashtable *hashtable,
const void *key, const void *value)
{
char str_int[64];
char *str;
/* make C compiler happy */
(void) key;
str = (char *)data;
if (str[0])
strcat (str, ",");
switch (hashtable->type_keys)
{
case HASHTABLE_INTEGER:
snprintf (str_int, sizeof (str_int), "%d", *((int *)key));
strcat (str, str_int);
break;
case HASHTABLE_STRING:
strcat (str, (char *)key);
break;
case HASHTABLE_POINTER:
case HASHTABLE_BUFFER:
case HASHTABLE_TIME:
case HASHTABLE_NUM_TYPES:
break;
}
strcat (str, ":");
switch (hashtable->type_values)
{
case HASHTABLE_INTEGER:
snprintf (str_int, sizeof (str_int), "%d", *((int *)value));
strcat (str, str_int);
break;
case HASHTABLE_STRING:
strcat (str, (char *)value);
break;
case HASHTABLE_POINTER:
case HASHTABLE_BUFFER:
case HASHTABLE_TIME:
case HASHTABLE_NUM_TYPES:
break;
}
}
/*
* hashtable_get_keys_values: get keys and/or values of hashtable as string
* string has format, one of:
* keys only: "key1,key2,key3"
* values only: "value1,value2,value3"
* keys + values: "key1:value1,key2:value2,key3:value3"
* Note: this works only if keys have type "integer",
* or "string"
*/
const char *
hashtable_get_keys (struct t_hashtable *hashtable)
hashtable_get_keys_values (struct t_hashtable *hashtable, int keys, int values)
{
int length;
if (hashtable->keys)
if (hashtable->keys_values)
{
free (hashtable->keys);
hashtable->keys = NULL;
free (hashtable->keys_values);
hashtable->keys_values = NULL;
}
/* first compute length of string */
length = 0;
hashtable_map (hashtable, &hashtable_get_keys_compute_length_cb, &length);
hashtable_map (hashtable,
(keys && values) ? &hashtable_compute_length_keys_values_cb :
((keys) ? &hashtable_compute_length_keys_cb :
&hashtable_compute_length_values_cb),
&length);
if (length == 0)
return hashtable->keys;
return hashtable->keys_values;
/* build string */
hashtable->keys = malloc (length + 1);
if (!hashtable->keys)
hashtable->keys_values = malloc (length + 1);
if (!hashtable->keys_values)
return NULL;
hashtable->keys[0] = '\0';
hashtable_map (hashtable, &hashtable_get_keys_build_string_cb,
hashtable->keys);
hashtable->keys_values[0] = '\0';
hashtable_map (hashtable,
(keys && values) ? &hashtable_build_string_keys_values_cb :
((keys) ? &hashtable_build_string_keys_cb :
&hashtable_build_string_values_cb),
hashtable->keys_values);
return hashtable->keys;
return hashtable->keys_values;
}
/*
@@ -550,7 +699,11 @@ hashtable_get_string (struct t_hashtable *hashtable, const char *property)
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 hashtable_get_keys_values (hashtable, 1, 0);
else if (string_strcasecmp (property, "values") == 0)
return hashtable_get_keys_values (hashtable, 0, 1);
else if (string_strcasecmp (property, "keys_values") == 0)
return hashtable_get_keys_values (hashtable, 1, 1);
}
return NULL;
@@ -704,8 +857,8 @@ hashtable_free (struct t_hashtable *hashtable)
hashtable_remove_all (hashtable);
free (hashtable->htable);
if (hashtable->keys)
free (hashtable->keys);
if (hashtable->keys_values)
free (hashtable->keys_values);
free (hashtable);
}
@@ -786,5 +939,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);
log_printf (" keys_values. . . . . . : '%s'", hashtable->keys_values);
}
src/core/wee-hashtable.h
+3 -2
View File
@@ -98,8 +98,9 @@ struct t_hashtable
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) */
/* keys/values as string */
char *keys_values; /* keys/values as string (NULL if */
/* never asked) */
};
extern struct t_hashtable *hashtable_new (int size,