[brlcad-commits] SF.net SVN: brlcad:[35002] isst/trunk/src

[<eri...@us...>]

Revision: 35002
          http://brlcad.svn.sourceforge.net/brlcad/?rev=35002&view=rev
Author:   erikgreenwald
Date:     2009-07-08 15:02:20 +0000 (Wed, 08 Jul 2009)

Log Message:
-----------
use bu_vls for database and host names. Trim whitespace around names.

Modified Paths:
--------------
    isst/trunk/src/gui.c
    isst/trunk/src/isst.h
    isst/trunk/src/sql.c

Modified: isst/trunk/src/gui.c
===================================================================
--- isst/trunk/src/gui.c	2009-07-08 15:02:12 UTC (rev 35001)
+++ isst/trunk/src/gui.c	2009-07-08 15:02:20 UTC (rev 35002)
@@ -313,6 +313,7 @@
 	unsigned int addrlen;
 	uint8_t op;
 
+
 	/* create a socket */
 	if ((isst.socket = socket (AF_INET, SOCK_STREAM, 0)) < 0) {
 		generic_dialog ("Unable to create network socket for master.");
@@ -325,10 +326,8 @@
 	my_addr.sin_addr.s_addr = INADDR_ANY;
 	my_addr.sin_port = htons (0);
 
-	if (gethostbyname (isst.master))
-	{
-		srv_hostent = gethostbyname (isst.master)[0];
-	}
+	if (gethostbyname (bu_vls_addr(&isst.master)))
+		srv_hostent = gethostbyname (bu_vls_addr(&isst.master))[0];
 	else
 	{
 		generic_dialog ("Hostname for master doesn't resolve.");
@@ -366,13 +365,13 @@
 	tienet_send (isst.socket, &op, 1);
 
 	/* Get back an endian value from the master to determine endian data will need to be in. */
-	tienet_recv (isst.socket, &isst.endian, sizeof (short));
+	tienet_recv (isst.socket, &isst.wid, sizeof (isst.wid));
 	isst.endian = isst.endian == 1 ? 0 : 1;
 
 
 	while (1)
 	{
-		uint16_t wid;
+		static short int wid = 0;
 
 		/* get op */
 		tienet_recv (isst.socket, &op, 1);
@@ -395,9 +394,7 @@
 			isst.update_avail = 0;
 		}
 		else 
-		{
-				isst.update_idle = 1;
-		}
+			isst.update_idle = 1;
 		pthread_mutex_unlock (&isst.update_mut);
 
 		tienet_recv (isst.socket, &buffer->ind, 4);
@@ -543,10 +540,13 @@
 
 	strcpy(isst.username, GTK_ENTRY (username)->text);
 	strcpy(isst.password, GTK_ENTRY (password)->text);
-	strcpy(isst.database, GTK_ENTRY (database)->text);
-	strcpy(isst.master, GTK_ENTRY (master)->text);
+	bu_vls_strcpy(&isst.database, GTK_ENTRY (database)->text);
+	bu_vls_strcpy(&isst.master, GTK_ENTRY (master)->text);
 
-	if(sql_connect( GTK_ENTRY(database)->text ) == 0) {
+	bu_vls_trimspace(&isst.database);
+	bu_vls_trimspace(&isst.master);
+
+	if(sql_connect( bu_vls_addr(&isst.database) ) == 0) {
 		gtk_label_set_text(GTK_LABEL (status), "Status: MySQL Connection Failed");
 		return;
 	}
@@ -562,7 +562,7 @@
 		GError *error = NULL;
 
 		/* Initiate networking */
-		if(strlen(isst.master) == 0 || strncmp(isst.master, "local", 5) == 0) {
+		if(strlen(bu_vls_addr(&isst.master)) == 0 || strcmp(bu_vls_addr(&isst.master), "local") == 0) {
 			isst.worker = isst_local_worker;
 			isst.work_frame = isst_local_work_frame;
 		} else {
@@ -1032,7 +1032,7 @@
 	tienet_send (isst.socket, &op, 1);
 
 	/* op + wid + strlen + string + pid + length_of_host */
-	size = sizeof(op) + sizeof(isst.wid) + sizeof(fmt) + strlen (isst.database) + sizeof(l) + sizeof(isst.pid) + 1;
+	size = sizeof(op) + sizeof(isst.wid) + sizeof(fmt) + bu_vls_strlen (&isst.database) + sizeof(l) + sizeof(isst.pid) + 1;
 
 	/* send size */
 	tienet_send (isst.socket, &size, 4);
@@ -1044,7 +1044,7 @@
 		li.wid = htonl(isst.wid);
 		li.fmt = htonl(fmt);
 		li.pid = htonl(isst.pid);
-		strncpy(li.dbnam, isst.database, 64 /* evil magic number, DB will be removed eventually */);
+		strncpy(li.dbnam, bu_vls_addr(&isst.database), 64 /* evil magic number, DB will be removed eventually */);
 		tienet_send(isst.socket, &li, sizeof(li));
 #else
 		op = ADRT_WORK_INIT;
@@ -1063,9 +1063,9 @@
 		tienet_send (isst.socket, &isst.pid, sizeof(isst.pid));
 
 		/* send database hostname */
-		l = strlen (isst.database) + 1;
+		l = bu_vls_strlen (&isst.database) + 1;
 		tienet_send (isst.socket, &l, sizeof(l));
-		tienet_send (isst.socket, isst.database, l);
+		tienet_send (isst.socket, bu_vls_addr(&isst.database), l);
 
 #endif
 	}
@@ -2426,8 +2426,8 @@
 	/* Authentication Info */
 	strcpy (isst.username, "");
 	strcpy (isst.password, "");
-	strcpy (isst.database, "");
-	strcpy (isst.master, "");
+	bu_vls_init (&isst.database);
+	bu_vls_init (&isst.master);
 	isst.connected = 0;
 
 	/* Camera Info */

Modified: isst/trunk/src/isst.h
===================================================================
--- isst/trunk/src/isst.h	2009-07-08 15:02:12 UTC (rev 35001)
+++ isst/trunk/src/isst.h	2009-07-08 15:02:20 UTC (rev 35002)
@@ -63,8 +63,8 @@
   /* general */
   char username[32];
   char password[32];
-  char database[64];
-  char master[64];
+  struct bu_vls database;
+  struct bu_vls master;
   int32_t uid;
   int32_t pid;
   uint16_t wid;

Modified: isst/trunk/src/sql.c
===================================================================
--- isst/trunk/src/sql.c	2009-07-08 15:02:12 UTC (rev 35001)
+++ isst/trunk/src/sql.c	2009-07-08 15:02:20 UTC (rev 35002)
@@ -30,6 +30,8 @@
 
 #include <mysql.h>
 
+#include <bu.h>
+
 #include "tie/tie.h"
 #include "tie/adrt.h"
 
@@ -46,7 +48,7 @@
 int
 sql_connect(char *host)
 {
-	sql_connected = mysql_real_connect(&isst.mysql_db, isst.database, ISST_MYSQL_USER, ISST_MYSQL_PASS, ISST_MYSQL_DB, 0, 0, 0)?1:0;
+	sql_connected = mysql_real_connect(&isst.mysql_db, bu_vls_addr(&isst.database), ISST_MYSQL_USER, ISST_MYSQL_PASS, ISST_MYSQL_DB, 0, 0, 0)?1:0;
 	return sql_connected;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.