[GRASS-SVN] r45328 - grass/branches/develbranch_6/db/drivers/dbf
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Feb 7 12:50:38 EST 2011
Author: neteler
Date: 2011-02-07 09:50:38 -0800 (Mon, 07 Feb 2011)
New Revision: 45328
Modified:
grass/branches/develbranch_6/db/drivers/dbf/dbfexe.c
Log:
revert bad formatting
Modified: grass/branches/develbranch_6/db/drivers/dbf/dbfexe.c
===================================================================
--- grass/branches/develbranch_6/db/drivers/dbf/dbfexe.c 2011-02-07 13:08:54 UTC (rev 45327)
+++ grass/branches/develbranch_6/db/drivers/dbf/dbfexe.c 2011-02-07 17:50:38 UTC (rev 45328)
@@ -33,41 +33,27 @@
#define NODE_ERROR 4
int yyparse(void);
-
void get_col_def(SQLPSTMT * st, int col, int *type, int *width,
int *decimals);
int sel(SQLPSTMT * st, int tab, int **set);
-
void eval_val(int tab, int row, int col, SQLPVALUE * inval,
SQLPVALUE * result);
int set_val(int tab, int row, int col, SQLPVALUE * val);
-
double eval_node(SQLPNODE *, int, int, SQLPVALUE *);
-
int eval_node_type(SQLPNODE *, int);
int execute(char *sql, cursor * c)
{
int i, j, tab, ret;
-
SQLPSTMT *st;
-
ROW *dbrows;
-
VALUE *dbval;
-
int row, nrows;
-
int *cols, ncols, col;
-
int *selset;
-
int dtype, stype;
-
int width, decimals;
-
char *tmpsql, name[500];
-
SQLPVALUE *calctmp; /* store for calculated values in UPDATE, if any */
/* parse sql statement */
@@ -486,15 +472,10 @@
static int cmp_row_asc(const void *pa, const void *pb)
{
int *row1 = (int *)pa;
-
int *row2 = (int *)pb;
-
char *c1, *c2;
-
int i1, i2;
-
double d1, d2;
-
TABLE *tbl;
tbl = &(db.tables[cur_cmp_table]);
@@ -554,9 +535,7 @@
int sel(SQLPSTMT * st, int tab, int **selset)
{
int i, ret, condition;
-
int *set; /* pointer to array of indexes to rows */
-
int aset, nset;
G_debug(2, "sel(): tab = %d", tab);
@@ -683,17 +662,11 @@
double eval_node(SQLPNODE * nptr, int tab, int row, SQLPVALUE * value)
{
int left, right;
-
SQLPVALUE left_value, right_value;
-
int ccol;
-
COLUMN *col;
-
VALUE *val;
-
double left_dval, right_dval, dval;
-
char *rightbuf;
/* Note: node types were previously checked by eval_node_type */
@@ -1033,9 +1006,7 @@
int eval_node_type(SQLPNODE * nptr, int tab)
{
int left, right;
-
int ccol;
-
COLUMN *col = NULL;
switch (nptr->node_type) {
More information about the grass-commit
mailing list