Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 14010 | Differences between
and this patch

Collapse All | Expand All

(-)sql.cc (-9 / +9 lines)
Lines 122-128 int fetchrowCmd(Tcl_Interp *interp, Sql_ Link Here
122
122
123
// -------------------------------------------------------------
123
// -------------------------------------------------------------
124
//
124
//
125
int SqlCmd(ClientData clientData, Tcl_Interp *interp, int argc, const char **argv) 
125
int SqlCmd(ClientData clientData, Tcl_Interp *interp, int argc, char **argv) 
126
{
126
{
127
	if (argc == 1) {
127
	if (argc == 1) {
128
		Tcl_SetResult(interp, "Usage: sql command ?handle?", TCL_STATIC);
128
		Tcl_SetResult(interp, "Usage: sql command ?handle?", TCL_STATIC);
Lines 137-143 int SqlCmd(ClientData clientData, Tcl_In Link Here
137
137
138
	// -----------------------------------
138
	// -----------------------------------
139
	if (strcmp(argv[1], "connect")==0) {
139
	if (strcmp(argv[1], "connect")==0) {
140
		c = mgr->connect(argc-2, (char **)(argv+2));
140
		c = mgr->connect(argc-2, argv+2);
141
		if (c < 0) {
141
		if (c < 0) {
142
			char *basemsg = "Unable to Connect: ";
142
			char *basemsg = "Unable to Connect: ";
143
			char *errmsg = mgr->getErrorMsg();
143
			char *errmsg = mgr->getErrorMsg();
Lines 160-166 int SqlCmd(ClientData clientData, Tcl_In Link Here
160
		if (argc <= 2) {
160
		if (argc <= 2) {
161
			Tcl_SetResult(interp, "Usage:\nsql command handle", TCL_STATIC);
161
			Tcl_SetResult(interp, "Usage:\nsql command handle", TCL_STATIC);
162
			return TCL_ERROR;
162
			return TCL_ERROR;
163
		} else if ((connid = stripPrefix((char *)argv[2], HANDLE_PREFIX)) < 0) {
163
		} else if ((connid = stripPrefix(argv[2], HANDLE_PREFIX)) < 0) {
164
			Tcl_AppendResult(interp, "sql: Invalid handle: ", argv[2], NULL);
164
			Tcl_AppendResult(interp, "sql: Invalid handle: ", argv[2], NULL);
165
			return TCL_ERROR;
165
			return TCL_ERROR;
166
		} else if (!mgr->inUse(connid)) {
166
		} else if (!mgr->inUse(connid)) {
Lines 172-190 int SqlCmd(ClientData clientData, Tcl_In Link Here
172
172
173
		// take care of the command:
173
		// take care of the command:
174
		if (strcmp(argv[1], "exec") == 0) {
174
		if (strcmp(argv[1], "exec") == 0) {
175
			res = execCmd(interp, conn, (char *)argv[3]);
175
			res = execCmd(interp, conn, argv[3]);
176
		} else if (strcmp(argv[1], "query") == 0) {
176
		} else if (strcmp(argv[1], "query") == 0) {
177
			res = queryCmd(interp, conn, (char *)argv[3]);
177
			res = queryCmd(interp, conn, argv[3]);
178
		} else if (strcmp(argv[1], "endquery") == 0) {
178
		} else if (strcmp(argv[1], "endquery") == 0) {
179
			res = endqueryCmd(interp, conn, (char *)argv[3]);
179
			res = endqueryCmd(interp, conn, argv[3]);
180
		} else if (strcmp(argv[1], "fetchrow") == 0) {
180
		} else if (strcmp(argv[1], "fetchrow") == 0) {
181
			res = fetchrowCmd(interp, conn, (char *)argv[3]);
181
			res = fetchrowCmd(interp, conn, argv[3]);
182
		} else if (strcmp(argv[1], "numrows") == 0) {
182
		} else if (strcmp(argv[1], "numrows") == 0) {
183
			res = numrowsCmd(interp, conn, (char *)argv[3]);
183
			res = numrowsCmd(interp, conn, argv[3]);
184
		} else if (strcmp(argv[1], "disconnect") == 0) {
184
		} else if (strcmp(argv[1], "disconnect") == 0) {
185
			res = disconnectCmd(interp, mgr, connid);
185
			res = disconnectCmd(interp, mgr, connid);
186
		} else if (strcmp(argv[1], "selectdb")==0) {
186
		} else if (strcmp(argv[1], "selectdb")==0) {
187
			res = selectdbCmd(interp, conn, (char *)argv[3]);
187
			res = selectdbCmd(interp, conn, argv[3]);
188
		} else {
188
		} else {
189
			Tcl_AppendResult(interp, "sql: unknown sql command: ", argv[1], NULL);
189
			Tcl_AppendResult(interp, "sql: unknown sql command: ", argv[1], NULL);
190
			return TCL_ERROR;
190
			return TCL_ERROR;

Return to bug 14010