1
0
mirror of https://github.com/weechat/weechat.git synced 2026-07-01 07:16:37 +02:00

core: replace "long unsigned int" by "unsigned long"

This commit is contained in:
Sébastien Helleu
2018-10-01 22:21:25 +02:00
parent b7f3ba69e1
commit 8abd05fe3d
26 changed files with 54 additions and 54 deletions
+5 -5
View File
@@ -156,7 +156,7 @@ eval_hdata_get_value (struct t_hdata *hdata, void *pointer, const char *path)
if (!path || !path[0])
{
snprintf (str_value, sizeof (str_value),
"0x%lx", (long unsigned int)pointer);
"0x%lx", (unsigned long)pointer);
return strdup (str_value);
}
@@ -205,7 +205,7 @@ eval_hdata_get_value (struct t_hdata *hdata, void *pointer, const char *path)
case WEECHAT_HDATA_POINTER:
pointer = hdata_pointer (hdata, pointer, var_name);
snprintf (str_value, sizeof (str_value),
"0x%lx", (long unsigned int)pointer);
"0x%lx", (unsigned long)pointer);
value = strdup (str_value);
break;
case WEECHAT_HDATA_TIME:
@@ -238,7 +238,7 @@ eval_hdata_get_value (struct t_hdata *hdata, void *pointer, const char *path)
case HASHTABLE_POINTER:
case HASHTABLE_BUFFER:
snprintf (str_value, sizeof (str_value),
"0x%lx", (long unsigned int)ptr_value);
"0x%lx", (unsigned long)ptr_value);
value = strdup (str_value);
break;
case HASHTABLE_TIME:
@@ -254,7 +254,7 @@ eval_hdata_get_value (struct t_hdata *hdata, void *pointer, const char *path)
else
{
snprintf (str_value, sizeof (str_value),
"0x%lx", (long unsigned int)pointer);
"0x%lx", (unsigned long)pointer);
value = strdup (str_value);
}
break;
@@ -324,7 +324,7 @@ eval_replace_vars_cb (void *data, const char *text)
int i, length_hide_char, length, index, rc, screen;
int count_suffix;
long number;
long unsigned int ptr;
unsigned long ptr;
time_t date;
struct tm *date_tmp;
+1 -1
View File
@@ -549,7 +549,7 @@ hashtable_to_string (enum t_hashtable_type type, const void *value)
case HASHTABLE_POINTER:
case HASHTABLE_BUFFER:
snprintf (str_value, sizeof (str_value),
"0x%lx", (long unsigned int)value);
"0x%lx", (unsigned long)value);
return str_value;
break;
case HASHTABLE_TIME:
+1 -1
View File
@@ -44,7 +44,7 @@ struct t_infolist_item;
if (__pointer) \
{ \
snprintf (str_value, sizeof (str_value), \
"0x%lx", (long unsigned int)__pointer); \
"0x%lx", (unsigned long)__pointer); \
hashtable_set (hashtable, __name, str_value); \
} \
else \
+2 -2
View File
@@ -496,7 +496,7 @@ hdata_check_pointer_map_cb (void *data, struct t_hashtable *hashtable,
if (!ptr_list || !(ptr_list->flags & WEECHAT_HDATA_LIST_CHECK_POINTERS))
return;
*found = (void *)((unsigned long int)hdata_check_pointer_in_list (
*found = (void *)((unsigned long)hdata_check_pointer_in_list (
ptr_hdata,
*((void **)(ptr_list->pointer)),
pointer));
@@ -994,7 +994,7 @@ hdata_set (struct t_hdata *hdata, void *pointer, const char *name,
struct t_hdata_var *var;
char **ptr_string, *error;
long number;
long unsigned int ptr;
unsigned long ptr;
int rc;
if (!hdata->update_pending)
+1 -1
View File
@@ -205,7 +205,7 @@ input_data (struct t_gui_buffer *buffer, const char *data)
/* execute modifier "input_text_for_buffer" */
snprintf (str_buffer, sizeof (str_buffer),
"0x%lx", (long unsigned int)buffer);
"0x%lx", (unsigned long)buffer);
new_data = hook_modifier_exec (NULL,
"input_text_for_buffer",
str_buffer,
+2 -2
View File
@@ -876,7 +876,7 @@ gui_bar_item_input_text_cb (const void *pointer, void *data,
/* for modifiers */
snprintf (str_buffer, sizeof (str_buffer),
"0x%lx", (long unsigned int)buffer);
"0x%lx", (unsigned long)buffer);
/* execute modifier with basic string (without cursor tag) */
ptr_input = NULL;
@@ -1922,7 +1922,7 @@ gui_bar_item_focus_buffer_nicklist_cb (const void *pointer,
struct t_gui_nick_group *ptr_group;
struct t_gui_nick *ptr_nick;
int i, rc, bar_item_line;
unsigned long int value;
unsigned long value;
const char *str_window, *str_buffer, *str_bar_item_line;
struct t_gui_window *window;
struct t_gui_buffer *buffer;
+1 -1
View File
@@ -387,7 +387,7 @@ gui_bar_check_conditions (struct t_gui_bar *bar,
snprintf (str_modifier, sizeof (str_modifier),
"bar_condition_%s", bar->name);
snprintf (str_window, sizeof (str_window),
"0x%lx", (long unsigned int)(window));
"0x%lx", (unsigned long)(window));
str_displayed = hook_modifier_exec (NULL,
str_modifier,
str_window,
+1 -1
View File
@@ -1112,7 +1112,7 @@ gui_chat_hsignal_quote_line_cb (const void *pointer, void *data,
struct t_hashtable *hashtable)
{
const char *date, *line, *prefix, *ptr_prefix, *message;
long unsigned int value;
unsigned long value;
long number;
struct tm *local_time;
struct t_gui_line *ptr_line;
+3 -3
View File
@@ -125,10 +125,10 @@ gui_cursor_display_debug_info ()
"chat: %d, word: \"%s\"",
gui_color_get_custom ("yellow,red"),
focus_info->x, focus_info->y,
(long unsigned int)focus_info->window,
(long unsigned int)focus_info->buffer,
(unsigned long)focus_info->window,
(unsigned long)focus_info->buffer,
(focus_info->buffer) ? (focus_info->buffer)->full_name : "-",
(long unsigned int)focus_info->bar_window,
(unsigned long)focus_info->bar_window,
(focus_info->bar_window) ? ((focus_info->bar_window)->bar)->name : "-",
(focus_info->bar_item) ? focus_info->bar_item : "-",
focus_info->bar_item_line,
+2 -2
View File
@@ -151,7 +151,7 @@ gui_history_add (struct t_gui_buffer *buffer, const char *string)
char *string2, str_buffer[128];
snprintf (str_buffer, sizeof (str_buffer),
"0x%lx", (long unsigned int)(buffer));
"0x%lx", (unsigned long)(buffer));
string2 = hook_modifier_exec (NULL, "history_add", str_buffer, string);
/*
@@ -231,7 +231,7 @@ gui_history_hdata_history_update_cb (void *data,
struct t_gui_history *ptr_history;
struct t_gui_buffer *ptr_buffer;
const char *text, *buffer;
long unsigned int value;
unsigned long value;
int rc;
/* make C compiler happy */
+1 -1
View File
@@ -159,7 +159,7 @@ gui_input_text_changed_modifier_and_signal (struct t_gui_buffer *buffer,
/* send modifier, and change input if needed */
snprintf (str_buffer, sizeof (str_buffer),
"0x%lx", (long unsigned int)buffer);
"0x%lx", (unsigned long)buffer);
new_input = hook_modifier_exec (NULL,
"input_text_content",
str_buffer,
+1 -1
View File
@@ -1042,7 +1042,7 @@ gui_key_focus_command (const char *key, int context,
{
struct t_gui_key *ptr_key;
int i, matching, debug, rc;
long unsigned int value;
unsigned long value;
char *command, **commands;
const char *str_buffer;
struct t_hashtable *hashtable;
+1 -1
View File
@@ -1343,7 +1343,7 @@ gui_line_hook_update (struct t_gui_line *line,
{
const char *ptr_value, *ptr_value2;
struct t_gui_buffer *ptr_buffer;
long unsigned int value_pointer;
unsigned long value_pointer;
long value;
char *error;
int rc, tags_updated, notify_level_updated, highlight_updated;
+1 -1
View File
@@ -70,7 +70,7 @@ gui_nicklist_send_signal (const char *signal, struct t_gui_buffer *buffer,
{
snprintf (str_args, length,
"0x%lx,%s",
(long unsigned int)(buffer),
(unsigned long)(buffer),
(arguments) ? arguments : "");
(void) hook_signal_send (signal,
WEECHAT_HOOK_SIGNAL_STRING, str_args);
+1 -1
View File
@@ -37,7 +37,7 @@ weechat_aspell_info_info_aspell_dict_cb (const void *pointer, void *data,
const char *arguments)
{
int rc;
long unsigned int value;
unsigned long value;
struct t_gui_buffer *buffer;
const char *buffer_full_name;
+1 -1
View File
@@ -608,7 +608,7 @@ weechat_aspell_modifier_cb (const void *pointer, void *data,
const char *modifier,
const char *modifier_data, const char *string)
{
long unsigned int value;
unsigned long value;
struct t_gui_buffer *buffer;
struct t_aspell_speller_buffer *ptr_speller_buffer;
char *result, *ptr_string, *ptr_string_orig, *pos_space;
+1 -1
View File
@@ -679,7 +679,7 @@ buflist_bar_item_init ()
buflist_bar_item_buflist[i] = weechat_bar_item_new (
buflist_bar_item_get_name (i),
&buflist_bar_item_buflist_cb,
(const void *)((long unsigned)i), NULL);
(const void *)((unsigned long)i), NULL);
}
return 1;
+2 -2
View File
@@ -143,7 +143,7 @@ end:
/* add pointer and plugin name */
snprintf (str_value, sizeof (str_value),
"0x%lx", (long unsigned int)ptr_buffer);
"0x%lx", (unsigned long)ptr_buffer);
weechat_hashtable_set (info, "pointer", str_value);
weechat_hashtable_set (info, "plugin",
weechat_buffer_get_string (ptr_buffer, "plugin"));
@@ -221,7 +221,7 @@ buflist_hsignal_cb (const void *pointer, void *data, const char *signal,
struct t_gui_buffer *ptr_buffer;
char *error, str_command[1024];
long number, number2;
long unsigned int value;
unsigned long value;
int rc, current_buffer_number;
/* make C compiler happy */
+3 -3
View File
@@ -41,7 +41,7 @@ fset_mouse_focus_cb (const void *pointer, void *data, struct t_hashtable *info)
{
const char *buffer;
int rc;
long unsigned int value;
unsigned long value;
struct t_gui_buffer *ptr_buffer;
long y;
char *error, str_value[128];
@@ -80,7 +80,7 @@ fset_mouse_focus_cb (const void *pointer, void *data, struct t_hashtable *info)
return info;
snprintf (str_value, sizeof (str_value),
"0x%lx", (long unsigned int)ptr_fset_option);
"0x%lx", (unsigned long)ptr_fset_option);
weechat_hashtable_set (info, "fset_option", str_value);
weechat_hashtable_set (info, "fset_option_name", ptr_fset_option->name);
weechat_hashtable_set (info, "fset_option_parent_name", ptr_fset_option->parent_name);
@@ -189,7 +189,7 @@ fset_mouse_hsignal_cb (const void *pointer, void *data, const char *signal,
const char *ptr_key, *ptr_chat_line_y, *ptr_fset_option_pointer;
char str_command[1024];
struct t_fset_option *ptr_fset_option;
long unsigned int value;
unsigned long value;
int rc, distance, num_options, y, y2, chat_line_y, chat_line_y2;
int min_y, max_y, i;
+1 -1
View File
@@ -552,7 +552,7 @@ struct t_hashtable *
irc_bar_item_focus_buffer_nicklist (const void *pointer, void *data,
struct t_hashtable *info)
{
long unsigned int value;
unsigned long value;
int rc;
struct t_gui_buffer *buffer;
struct t_irc_nick *ptr_nick;
+1 -1
View File
@@ -55,7 +55,7 @@ irc_info_create_string_with_pointer (char **string, void *pointer)
*string = malloc (64);
if (*string)
{
snprintf (*string, 64, "0x%lx", (long unsigned int)pointer);
snprintf (*string, 64, "0x%lx", (unsigned long)pointer);
}
}
}
+2 -2
View File
@@ -346,7 +346,7 @@ plugin_script_ptr2str (void *pointer)
return str_pointer[index_pointer];
snprintf (str_pointer[index_pointer], sizeof (str_pointer[index_pointer]),
"0x%lx", (long unsigned int)pointer);
"0x%lx", (unsigned long)pointer);
return str_pointer[index_pointer];
}
@@ -362,7 +362,7 @@ plugin_script_str2ptr (struct t_weechat_plugin *weechat_plugin,
const char *script_name, const char *function_name,
const char *str_pointer)
{
long unsigned int value;
unsigned long value;
int rc;
struct t_gui_buffer *ptr_buffer;
@@ -226,7 +226,7 @@ relay_weechat_msg_add_pointer (struct t_relay_weechat_msg *msg, void *pointer)
unsigned char length;
snprintf (str_pointer, sizeof (str_pointer),
"%lx", (long unsigned int)pointer);
"%lx", (unsigned long)pointer);
length = strlen (str_pointer);
relay_weechat_msg_add_bytes (msg, &length, 1);
relay_weechat_msg_add_bytes (msg, str_pointer, length);
@@ -557,7 +557,7 @@ relay_weechat_msg_add_hdata (struct t_relay_weechat_msg *msg,
char *path_returned;
const char *hdata_name, *array_size;
void *pointer, **path_pointers;
long unsigned int value;
unsigned long value;
int rc, num_keys, num_path, i, type, pos_count, count, rc_sscanf;
uint32_t count32;
@@ -63,7 +63,7 @@ struct t_gui_buffer *
relay_weechat_protocol_get_buffer (const char *arg)
{
struct t_gui_buffer *ptr_buffer;
long unsigned int value;
unsigned long value;
int rc;
struct t_hdata *ptr_hdata;
@@ -288,7 +288,7 @@ RELAY_WEECHAT_PROTOCOL_CALLBACK(info)
RELAY_WEECHAT_PROTOCOL_CALLBACK(infolist)
{
struct t_relay_weechat_msg *msg;
long unsigned int value;
unsigned long value;
char *args;
int rc;
@@ -498,7 +498,7 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (long unsigned int)ptr_buffer);
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"number,full_name,short_name,"
"nicklist,title,local_variables,"
@@ -523,7 +523,7 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (long unsigned int)ptr_buffer);
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"number,full_name,type");
relay_weechat_msg_send (ptr_client, msg);
@@ -546,7 +546,7 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (long unsigned int)ptr_buffer);
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"number,full_name,"
"prev_buffer,next_buffer");
@@ -571,7 +571,7 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (long unsigned int)ptr_buffer);
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"number,full_name,"
"prev_buffer,next_buffer");
@@ -596,7 +596,7 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (long unsigned int)ptr_buffer);
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"number,full_name,"
"prev_buffer,next_buffer");
@@ -620,7 +620,7 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (long unsigned int)ptr_buffer);
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"number,full_name,short_name,"
"local_variables");
@@ -644,7 +644,7 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (long unsigned int)ptr_buffer);
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"number,full_name,title");
relay_weechat_msg_send (ptr_client, msg);
@@ -667,7 +667,7 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (long unsigned int)ptr_buffer);
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"number,full_name,local_variables");
relay_weechat_msg_send (ptr_client, msg);
@@ -689,7 +689,7 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (long unsigned int)ptr_buffer);
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"number,full_name");
relay_weechat_msg_send (ptr_client, msg);
@@ -729,7 +729,7 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
{
snprintf (cmd_hdata, sizeof (cmd_hdata),
"line_data:0x%lx",
(long unsigned int)ptr_line_data);
(unsigned long)ptr_line_data);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"buffer,date,date_printed,"
"displayed,highlight,tags_array,"
@@ -754,7 +754,7 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (long unsigned int)ptr_buffer);
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"number,full_name");
relay_weechat_msg_send (ptr_client, msg);
+1 -1
View File
@@ -39,7 +39,7 @@ script_mouse_focus_chat_cb (const void *pointer, void *data,
{
const char *buffer;
int rc;
long unsigned int value;
unsigned long value;
struct t_gui_buffer *ptr_buffer;
long x;
char *error, str_date[64];
+3 -3
View File
@@ -522,7 +522,7 @@ trigger_callback_signal_cb (const void *pointer, void *data,
if (signal_data)
{
snprintf (str_data, sizeof (str_data),
"0x%lx", (long unsigned int)signal_data);
"0x%lx", (unsigned long)signal_data);
}
ptr_signal_data = str_data;
}
@@ -787,7 +787,7 @@ trigger_callback_line_cb (const void *pointer, void *data,
struct t_hashtable *hashtable;
struct t_gui_buffer *buffer;
struct t_weelist_item *ptr_item;
long unsigned int value;
unsigned long value;
const char *ptr_key, *ptr_value;
char **tags, *str_tags, *string_no_color;
int rc, num_tags, length;
@@ -1130,7 +1130,7 @@ trigger_callback_focus_cb (const void *pointer, void *data,
struct t_hashtable *info)
{
const char *ptr_value;
long unsigned int value;
unsigned long value;
int rc;
TRIGGER_CALLBACK_CB_INIT(info);