mirror of
https://github.com/ZoiteChat/zoitechat.git
synced 2026-03-14 09:40:20 +00:00
Fix some obvious type warnings.
This commit is contained in:
@@ -586,10 +586,10 @@ const struct prefs vars[] =
|
||||
{0, 0, 0},
|
||||
};
|
||||
|
||||
static char *
|
||||
static const char *
|
||||
convert_with_fallback (const char *str, const char *fallback)
|
||||
{
|
||||
char *utf;
|
||||
const char *utf;
|
||||
|
||||
#ifndef WIN32
|
||||
/* On non-Windows, g_get_user_name and g_get_real_name return a string in system locale, so convert it to utf-8. */
|
||||
|
||||
@@ -260,7 +260,7 @@ lag_check (void)
|
||||
unsigned long tim;
|
||||
char tbuf[128];
|
||||
time_t now = time (0);
|
||||
int lag;
|
||||
time_t lag;
|
||||
|
||||
tim = make_ping_time ();
|
||||
|
||||
@@ -270,14 +270,15 @@ lag_check (void)
|
||||
if (serv->connected && serv->end_of_motd)
|
||||
{
|
||||
lag = now - serv->ping_recv;
|
||||
if (prefs.hex_net_ping_timeout && lag > prefs.hex_net_ping_timeout && lag > 0)
|
||||
if (prefs.hex_net_ping_timeout != 0 && lag > prefs.hex_net_ping_timeout && lag > 0)
|
||||
{
|
||||
sprintf (tbuf, "%d", lag);
|
||||
sprintf (tbuf, "%" G_GINT64_FORMAT, (gint64) lag);
|
||||
EMIT_SIGNAL (XP_TE_PINGTIMEOUT, serv->server_session, tbuf, NULL,
|
||||
NULL, NULL, 0);
|
||||
if (prefs.hex_net_auto_reconnect)
|
||||
serv->auto_reconnect (serv, FALSE, -1);
|
||||
} else
|
||||
}
|
||||
else
|
||||
{
|
||||
snprintf (tbuf, sizeof (tbuf), "LAG%lu", tim);
|
||||
serv->p_ping (serv, "", tbuf);
|
||||
@@ -396,7 +397,6 @@ irc_init (session *sess)
|
||||
{
|
||||
static int done_init = FALSE;
|
||||
char *buf;
|
||||
int i;
|
||||
|
||||
if (done_init)
|
||||
return;
|
||||
@@ -431,7 +431,8 @@ irc_init (session *sess)
|
||||
|
||||
if (arg_urls != NULL)
|
||||
{
|
||||
for (i = 0; i < g_strv_length(arg_urls); i++)
|
||||
guint i;
|
||||
for (i = 0; i < g_strv_length (arg_urls); i++)
|
||||
{
|
||||
buf = g_strdup_printf ("%s %s", i==0? "server" : "newserver", arg_urls[i]);
|
||||
handle_command (sess, buf, FALSE);
|
||||
@@ -1012,7 +1013,7 @@ main (int argc, char *argv[])
|
||||
int i;
|
||||
int ret;
|
||||
|
||||
srand (time (0)); /* CL: do this only once! */
|
||||
srand ((unsigned int) time (NULL)); /* CL: do this only once! */
|
||||
|
||||
/* We must check for the config dir parameter, otherwise load_config() will behave incorrectly.
|
||||
* load_config() must come before fe_args() because fe_args() calls gtk_init() which needs to
|
||||
|
||||
@@ -682,7 +682,8 @@ inbound_nameslist (server *serv, char *chan, char *names,
|
||||
char **name_list;
|
||||
char *host, *nopre_name;
|
||||
char name[NICKLEN];
|
||||
int i, offset;
|
||||
int i;
|
||||
size_t offset;
|
||||
|
||||
sess = find_channel (serv, chan);
|
||||
if (!sess)
|
||||
|
||||
@@ -677,10 +677,10 @@ handle_mode (server * serv, char *word[], char *word_eol[],
|
||||
char *argstr;
|
||||
char sign;
|
||||
int len;
|
||||
int arg;
|
||||
int i, num_args;
|
||||
size_t arg;
|
||||
size_t i, num_args;
|
||||
int num_modes;
|
||||
int offset = 3;
|
||||
size_t offset = 3;
|
||||
int all_modes_have_args = FALSE;
|
||||
int using_front_tab = FALSE;
|
||||
mode_run mr;
|
||||
@@ -762,7 +762,7 @@ handle_mode (server * serv, char *word[], char *word_eol[],
|
||||
break;
|
||||
default:
|
||||
argstr = "";
|
||||
if ((all_modes_have_args || mode_has_arg (serv, sign, *modes)) && arg < (num_args+1))
|
||||
if ((all_modes_have_args || mode_has_arg (serv, sign, *modes)) && arg < (num_args + 1))
|
||||
{
|
||||
arg++;
|
||||
argstr = word[arg + offset];
|
||||
|
||||
@@ -1355,8 +1355,8 @@ process_named_servermsg (session *sess, char *buf, char *rawname, char *word_eol
|
||||
/* Returns the timezone offset. This should be the same as the variable
|
||||
* "timezone" in time.h, but *BSD doesn't have it.
|
||||
*/
|
||||
static int
|
||||
get_timezone(void)
|
||||
static time_t
|
||||
get_timezone (void)
|
||||
{
|
||||
struct tm tm_utc, tm_local;
|
||||
time_t t, time_utc, time_local;
|
||||
|
||||
@@ -142,7 +142,7 @@ tab_scroll_left_up_clicked (GtkWidget *widget, chanview *cv)
|
||||
gfloat new_value;
|
||||
GtkWidget *inner;
|
||||
GdkWindow *parent_win;
|
||||
gfloat i;
|
||||
gdouble i;
|
||||
|
||||
inner = ((tabview *)cv)->inner;
|
||||
parent_win = gtk_widget_get_window (gtk_widget_get_parent (inner));
|
||||
@@ -191,7 +191,7 @@ tab_scroll_right_down_clicked (GtkWidget *widget, chanview *cv)
|
||||
gfloat new_value;
|
||||
GtkWidget *inner;
|
||||
GdkWindow *parent_win;
|
||||
gfloat i;
|
||||
gdouble i;
|
||||
|
||||
inner = ((tabview *)cv)->inner;
|
||||
parent_win = gtk_widget_get_window (gtk_widget_get_parent (inner));
|
||||
|
||||
@@ -336,7 +336,7 @@ custom_list_get_iter (GtkTreeModel * tree_model,
|
||||
gint n;
|
||||
|
||||
n = gtk_tree_path_get_indices (path)[0];
|
||||
if (n >= custom_list->num_rows || n < 0)
|
||||
if (n < 0 || (guint) n >= custom_list->num_rows)
|
||||
return FALSE;
|
||||
|
||||
record = custom_list->rows[n];
|
||||
@@ -533,7 +533,7 @@ custom_list_iter_nth_child (GtkTreeModel * tree_model,
|
||||
return FALSE;
|
||||
|
||||
/* special case: if parent == NULL, set iter to n-th top-level row */
|
||||
if (n >= custom_list->num_rows)
|
||||
if (n < 0 || (guint) n >= custom_list->num_rows)
|
||||
return FALSE;
|
||||
|
||||
iter->user_data = custom_list->rows[n];
|
||||
|
||||
@@ -77,10 +77,10 @@ struct _CustomList
|
||||
{
|
||||
GObject parent;
|
||||
|
||||
guint num_rows; /* number of rows that we have used */
|
||||
guint num_alloc; /* number of rows allocated */
|
||||
chanlistrow **rows; /* a dynamically allocated array of pointers to the
|
||||
* CustomRecord structure for each row */
|
||||
guint num_rows; /* number of rows that we have used */
|
||||
guint num_alloc; /* number of rows allocated */
|
||||
chanlistrow **rows; /* a dynamically allocated array of pointers to the
|
||||
* CustomRecord structure for each row */
|
||||
|
||||
gint n_columns;
|
||||
GType column_types[CUSTOM_LIST_N_COLUMNS];
|
||||
|
||||
@@ -92,9 +92,9 @@ struct server_gui
|
||||
guint chanlist_channels_shown_count; /* total number of displayed
|
||||
channels */
|
||||
|
||||
int chanlist_maxusers;
|
||||
int chanlist_minusers;
|
||||
int chanlist_minusers_downloaded; /* used by LIST IRC command */
|
||||
guint32 chanlist_maxusers;
|
||||
guint32 chanlist_minusers;
|
||||
guint32 chanlist_minusers_downloaded; /* used by LIST IRC command */
|
||||
int chanlist_search_type; /* 0=simple 1=pattern/wildcard 2=regexp */
|
||||
gboolean chanlist_caption_is_stale;
|
||||
};
|
||||
|
||||
@@ -1600,7 +1600,7 @@ key_action_tab_comp (GtkWidget *t, GdkEventKey *entry, char *d1, char *d2,
|
||||
old_gcomp.elen = elen;
|
||||
|
||||
/* Get the first nick and put out the data for future nickcompletes */
|
||||
if (prefs.hex_completion_amount && g_list_length (list) <= prefs.hex_completion_amount)
|
||||
if (prefs.hex_completion_amount > 0 && g_list_length (list) <= (guint) prefs.hex_completion_amount)
|
||||
{
|
||||
g_free(result);
|
||||
result = (char*)list->data;
|
||||
|
||||
@@ -151,7 +151,7 @@ joind_show_dialog (server *serv)
|
||||
image1 = gtk_image_new_from_stock (GTK_STOCK_NETWORK, GTK_ICON_SIZE_LARGE_TOOLBAR);
|
||||
gtk_widget_show (image1);
|
||||
gtk_box_pack_start (GTK_BOX (hbox1), image1, FALSE, TRUE, 24);
|
||||
gtk_misc_set_alignment (GTK_MISC (image1), 0.5, 0.06);
|
||||
gtk_misc_set_alignment (GTK_MISC (image1), 0.5f, 0.06f);
|
||||
|
||||
vbox2 = gtk_vbox_new (FALSE, 10);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox2), 6);
|
||||
|
||||
@@ -557,7 +557,7 @@ static int
|
||||
mg_progressbar_update (GtkWidget *bar)
|
||||
{
|
||||
static int type = 0;
|
||||
static float pos = 0;
|
||||
static gdouble pos = 0;
|
||||
|
||||
pos += 0.05;
|
||||
if (pos >= 0.99)
|
||||
|
||||
@@ -146,7 +146,7 @@ fe_add_rawlog (server *serv, char *text, int len, int outbound)
|
||||
{
|
||||
char **split_text;
|
||||
char *new_text;
|
||||
int i;
|
||||
size_t i;
|
||||
|
||||
if (!serv->gui->rawlog_window)
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user