zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-11 04:43:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Some signed/unsigned warnings removed. Don't call fe_exec_init/deinit in win32

Browse source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1104 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-01-11 10:15:34 +00:00 • committed by cras
commit 1a3c700838
7 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/network.c
View file

@ -180,7 +180,11 @@ GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip)
sin_set_port(&so, port);
ret = connect(handle, &so.sa, SIZEOF_SOCKADDR(so));
#ifndef WIN32
if (ret < 0 && errno != EINPROGRESS) {
#else
if (ret < 0 && WSAGetLastError() != WSAEWOULDBLOCK) {
#endif
close(handle);
return NULL;
}

4
src/core/nicklist.c
View file

@ -228,12 +228,12 @@ void nicklist_update_flags(SERVER_REC *server, const char *nick,
rec->last_check = time(NULL);
if (gone != -1 && rec->gone != gone) {
if (gone != -1 && (int)rec->gone != gone) {
rec->gone = gone;
signal_emit("nick gone changed", 2, channel, rec);
}
if (serverop != -1 && rec->serverop != serverop) {
if (serverop != -1 && (int)rec->serverop != serverop) {
rec->serverop = serverop;
signal_emit("nick serverop changed", 2, channel, rec);
}

12
src/core/settings.c
View file

@ -442,7 +442,8 @@ static CONFIG_REC *parse_configfile(const char *fname)
char *real_fname;
real_fname = fname != NULL ? g_strdup(fname) :
g_strdup_printf("%s/.irssi/config", g_get_home_dir());
g_strdup_printf("%s"G_DIR_SEPARATOR_S".irssi"
G_DIR_SEPARATOR_S"config", g_get_home_dir());
config = config_open(real_fname, -1);
if (config != NULL)
@ -473,17 +474,16 @@ static void init_configfile(void)
struct stat statbuf;
char *str;
str = g_strdup_printf("%s/.irssi", g_get_home_dir());
str = g_strdup_printf("%s"G_DIR_SEPARATOR_S".irssi", g_get_home_dir());
if (stat(str, &statbuf) != 0) {
/* ~/.irssi not found, create it. */
if (mkpath(str, 0700) != 0) {
g_error(_("Couldn't create %s/.irssi directory"),
g_get_home_dir());
g_error(_("Couldn't create %s directory"), str);
}
} else if (!S_ISDIR(statbuf.st_mode)) {
g_error(_("%s/.irssi is not a directory.\n"
g_error(_("%s is not a directory.\n"
"You should remove it with command: rm ~/.irssi"),
g_get_home_dir());
str);
}
g_free(str);