Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm/src
Modified Files:
command.c libscream.c
Log Message:
Wed Oct 18 13:35:18 2006 Michael Jennings (mej)
Fixed a typo and some logic errors in libscream located by Mike
Frysinger <[EMAIL PROTECTED]>.
----------------------------------------------------------------------
===================================================================
RCS file: /cvs/e/eterm/Eterm/src/command.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -3 -r1.113 -r1.114
--- command.c 18 Aug 2006 17:41:19 -0000 1.113
+++ command.c 18 Oct 2006 17:36:10 -0000 1.114
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: command.c,v 1.113 2006/08/18 17:41:19
mej Exp $";
+static const char cvs_ident[] = "$Id: command.c,v 1.114 2006/10/18 17:36:10
mej Exp $";
/* includes: */
#include "config.h"
@@ -1125,7 +1125,7 @@
/* 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
===================================================================
RCS file: /cvs/e/eterm/Eterm/src/libscream.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- libscream.c 19 Sep 2006 21:07:40 -0000 1.33
+++ libscream.c 18 Oct 2006 17:36:10 -0000 1.34
@@ -1084,13 +1084,13 @@
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 @@
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) {
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
