Commit f02f714a authored by Martin Blix Grydeland's avatar Martin Blix Grydeland

Remove file reading code until finished, to get rid of compiler warnings

parent eba8c98e
...@@ -81,7 +81,6 @@ main(int argc, char * const *argv) ...@@ -81,7 +81,6 @@ main(int argc, char * const *argv)
char optchar; char optchar;
int d_opt = 0; int d_opt = 0;
char *g_arg = NULL; char *g_arg = NULL;
char *r_arg = NULL;
struct VSL_data *vsl; struct VSL_data *vsl;
struct VSM_data *vsm; struct VSM_data *vsm;
...@@ -108,10 +107,6 @@ main(int argc, char * const *argv) ...@@ -108,10 +107,6 @@ main(int argc, char * const *argv)
/* Instance name */ /* Instance name */
if (VSM_n_Arg(vsm, optarg) > 0) if (VSM_n_Arg(vsm, optarg) > 0)
break; break;
case 'r':
/* Read from file */
r_arg = optarg;
break;
default: default:
if (!VSL_Arg(vsl, optchar, optarg)) if (!VSL_Arg(vsl, optchar, optarg))
usage(); usage();
...@@ -132,16 +127,11 @@ main(int argc, char * const *argv) ...@@ -132,16 +127,11 @@ main(int argc, char * const *argv)
} }
/* Create cursor */ /* Create cursor */
if (r_arg) {
/* XXX */
error (1, "-r not implemented");
} else {
if (VSM_Open(vsm)) if (VSM_Open(vsm))
error(1, "VSM_Open: %s", VSM_Error(vsm)); error(1, "VSM_Open: %s", VSM_Error(vsm));
if (!(c = VSL_CursorVSM(vsl, vsm, !d_opt))) c = VSL_CursorVSM(vsl, vsm, !d_opt);
if (c == NULL)
error(1, "VSL_CursorVSM: %s", VSL_Error(vsl)); error(1, "VSL_CursorVSM: %s", VSL_Error(vsl));
}
AN(c);
/* Create query */ /* Create query */
q = VSLQ_New(vsl, &c, grouping, argv[optind]); q = VSLQ_New(vsl, &c, grouping, argv[optind]);
...@@ -150,7 +140,7 @@ main(int argc, char * const *argv) ...@@ -150,7 +140,7 @@ main(int argc, char * const *argv)
AZ(c); AZ(c);
while (1) { while (1) {
while (!r_arg && q == NULL) { while (q == NULL) {
VTIM_sleep(0.1); VTIM_sleep(0.1);
if (VSM_Open(vsm)) { if (VSM_Open(vsm)) {
VSM_ResetError(vsm); VSM_ResetError(vsm);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment