diff options
| author | Michael Jennings <mej@kainx.org> | 2006-10-18 17:36:10 +0000 |
|---|---|---|
| committer | Michael Jennings <mej@kainx.org> | 2006-10-18 17:36:10 +0000 |
| commit | 3ccf45d5af38468a46c21c19082acf5e295e772c (patch) | |
| tree | cf2f90bf20d38cd2bc6c52fb58e958c1b08a5ba7 /src | |
| parent | 517985c4a9b44756dc7dfca9a7155d8bba21aa9d (diff) | |
| download | eterm-3ccf45d5af38468a46c21c19082acf5e295e772c.tar.gz | |
Wed Oct 18 13:35:18 2006 Michael Jennings (mej)
Fixed a typo and some logic errors in libscream located by Mike
Frysinger <vapier@gentoo.org>.
----------------------------------------------------------------------
SVN revision: 26691
Diffstat (limited to 'src')
| -rw-r--r-- | src/command.c | 2 | ||||
| -rw-r--r-- | src/libscream.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/command.c b/src/command.c index e9ca487..81cb386 100644 --- a/src/command.c +++ b/src/command.c @@ -1125,7 +1125,7 @@ x_resource_dump(int sig) /* Create type atoms for future use. */ pixmap_atom = XInternAtom(Xdisplay, "PIXMAP", False); gc_atom = XInternAtom(Xdisplay, "GC", False); - gc_atom = XInternAtom(Xdisplay, "FONT", False); + font_atom = XInternAtom(Xdisplay, "FONT", False); /* Look at what *we* think our consumption is. */ #if DEBUG >= DEBUG_MEM diff --git a/src/libscream.c b/src/libscream.c index 82a809c..61482dc 100644 --- a/src/libscream.c +++ b/src/libscream.c @@ -1084,13 +1084,13 @@ ns_attach_lcl(_ns_sess ** sp) static int ns_wait_for_socket(int port) { - int tmp_sock, ret; + int tmp_sock, ret = -1; time_t start_time; D_ESCREEN(("Waiting for forwarder to begin listening on port %d.\n", port)); tmp_sock = socket(PF_INET, SOCK_STREAM, 6); start_time = time(NULL); - if (tmp_sock > 0) { + if (tmp_sock >= 0) { struct sockaddr_in addr; char timeout = 0; @@ -1933,7 +1933,7 @@ int ns_ren_disp(_ns_sess * s, int d, char *name) { char *i = NULL, *n; - size_t l; + size_t l = 0; int ret = NS_FAIL; if (!s) { |