X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mysql_selector.c;h=a53632c524c8be7bdc05d91d2365deb9ff00289e;hp=cdb36dd2d0a3d50a008c3579b8e2a733e69e8a04;hb=c430e588047c5db3eb0d043c4dd1378680ec2bcf;hpb=58ad3169dc1a4999ef3250753f980f168bd2f29e

diff --git a/mysql_selector.c b/mysql_selector.c
index cdb36dd2..a53632c5 100644
--- a/mysql_selector.c
+++ b/mysql_selector.c
@@ -599,7 +599,7 @@ static struct para_macro macro_list[] = {
 	}
 };
 
-static int real_query(char *query)
+static int real_query(const char *query)
 {
 	if (!mysql_ptr)
 		return -E_NOTCONN;
@@ -616,7 +616,7 @@ static int real_query(char *query)
  * Use open connection given by mysql_ptr to query server. Returns a
  * result pointer on succes and NULL on errors
  */
-static struct MYSQL_RES *get_result(char *query)
+static struct MYSQL_RES *get_result(const char *query)
 {
 	void *result;
 
@@ -1337,7 +1337,7 @@ out:
 		free(name);
 	return ret;
 }
-static int change_stream(char *stream)
+static int change_stream(const char *stream)
 {
 	char *query;
 	int ret;
@@ -1516,7 +1516,7 @@ static int com_set(__unused int fd, int argc, char *argv[])
 	char *q, *ebn;
 	long unsigned id;
 	int i, ret;
-	char *field = strcmp(argv[0], "picass")? "numplayed" : "pic_id";
+	const char *field = strcmp(argv[0], "picass")? "numplayed" : "pic_id";
 
 	if (argc < 2)
 		return -E_MYSQL_SYNTAX;
@@ -2435,17 +2435,9 @@ static void write_msg2mmd(int success)
 /* create database */
 static int com_cdb(int fd, int argc, char *argv[])
 {
-	char *query, *name;
+	char *query;
 	int ret;
 
-	if (argc < 1)
-		name = "paraslash";
-	else {
-		ret = -E_NAMETOOLONG;
-		name = argv[1];
-		if (strlen(name) > MAXLINE)
-			goto out;
-	}
 	if (mysql_ptr) {
 		PARA_INFO_LOG("%s", "closing database\n");
 		mysql_close(mysql_ptr);
@@ -2455,14 +2447,15 @@ static int com_cdb(int fd, int argc, char *argv[])
 	ret = -E_MYSQL_INIT;
 	if (init_mysql_server() < 0 || !mysql_ptr)
 		goto out;
-	query = make_message("create database %s", name);
+	conf.mysql_database_arg = para_strdup((argc < 1)?
+		"paraslash" : argv[1]);
+	query = make_message("create database %s", conf.mysql_database_arg);
 	ret = real_query(query);
 	free(query);
 	if (ret < 0)
 		goto out;
 	/* reconnect with database just created */
 	mysql_close(mysql_ptr);
-	conf.mysql_database_arg = para_strdup(name);
 	ret = -E_MYSQL_INIT;
 	if (init_mysql_server() < 0 || !mysql_ptr)
 		goto out;
@@ -2493,7 +2486,8 @@ static int com_cdb(int fd, int argc, char *argv[])
 	if (real_query("insert into streams (name, def) values "
 			"('current_stream', '(none)')") < 0)
 		goto out;
-	ret = send_va_buffer(fd, "successfully created database %s\n", name);
+	ret = send_va_buffer(fd, "successfully created database %s\n",
+		conf.mysql_database_arg);
 out:
 	return ret;
 }