whitespace

1 files changed, 998 insertions, 998 deletions

diff --git a/ext/dbplus/php_dbplus.c b/ext/dbplus/php_dbplus.c
index 4feff92193..b5459eeec1 100644
--- a/ext/dbplus/php_dbplus.c
+++ b/ext/dbplus/php_dbplus.c
@@ -31,72 +31,72 @@
 #define _INT(x)    ((*x)->value.lval)
 #define _HASH(x)   ((*x)->value.ht)
 
-#define DBPLUS_FETCH_RESOURCE(r, z) 	ZEND_FETCH_RESOURCE(r, relf *, z, -1, "dbplus_relation", le_dbplus_relation); \
-	                                	if(!r) RETURN_LONG(ERR_UNKNOWN);
+#define DBPLUS_FETCH_RESOURCE(r, z)   ZEND_FETCH_RESOURCE(r, relf *, z, -1, "dbplus_relation", le_dbplus_relation); \
+                                    if(!r) RETURN_LONG(ERR_UNKNOWN);
 
 
 static int
-var2tuple(relf *r, zval **zv,	tuple *t)
+var2tuple(relf *r, zval **zv, tuple *t)
 {
-	register attribute *ap ;
-	unsigned deg ;
-	zval **element;
-	
-	if ((*zv)->type!=IS_ARRAY)
-		return 1;
-	
-	rtupinit(r, t);
-	
-	ap = r->r_atts;
-	deg = r->r_rel.rel_deg;
-	do {
-		if(SUCCESS!=zend_hash_find((*zv)->value.ht, ap->att_name, strlen(ap->att_name)+1, (void **)&element))
-			continue;
-
-		if (! *element) return 1;
-		
-		switch(ap->att_type) {
-		case FT_SHORT: 	 
-			convert_to_long_ex(element);
-			AFFIX(ap, t)->f_short    = (short) (*element)->value.lval; 
-			break;
-		case FT_UNSIGNED:			
-			convert_to_long_ex(element);
-			AFFIX(ap, t)->f_unsigned = (unsigned) (*element)->value.lval; 
-			break;
-		case FT_SEQUENCE:
-		case FT_LONG:    			
-			convert_to_long_ex(element);
-			AFFIX(ap, t)->f_long     = (long) (*element)->value.lval; 
-			break;
-		case FT_DATE:	   			
-			convert_to_long_ex(element);
-			AFFIX(ap, t)->f_date     = (long) (*element)->value.lval; 
-			break;
-		case FT_FLOAT:   			
-			convert_to_double_ex(element);
-			AFFIX(ap, t)->f_float    = (float) (*element)->value.dval; 
-			break;
-		case FT_DOUBLE:  			
-			convert_to_double_ex(element);
-			AFFIX(ap, t)->f_double   = (double) (*element)->value.dval; 
-			break;
-		case FT_STRING: case FT_DEUTSCH: case FT_CHAR:			
-				convert_to_string_ex(element);
-				afput(ap, t, (field *)0, (*element)->value.str.val); 
-				break;
-		case FT_TIMESTAMP:
-			/* TODO
-	    str2timestamp(SvPV(sv, na), (timestamp *)AFFIX(ap, t));
-			*/
-	    break;
-		case FT_BINARY:
-		case FT_BLOB:
-		case FT_MEMO:
-	    break;
-		}
-	} while (ap++, --deg);
-	return 0;
+  register attribute *ap ;
+  unsigned deg ;
+  zval **element;
+  
+  if ((*zv)->type!=IS_ARRAY)
+    return 1;
+  
+  rtupinit(r, t);
+  
+  ap = r->r_atts;
+  deg = r->r_rel.rel_deg;
+  do {
+    if(SUCCESS!=zend_hash_find((*zv)->value.ht, ap->att_name, strlen(ap->att_name)+1, (void **)&element))
+      continue;
+
+    if (! *element) return 1;
+    
+    switch(ap->att_type) {
+    case FT_SHORT:   
+      convert_to_long_ex(element);
+      AFFIX(ap, t)->f_short    = (short) (*element)->value.lval; 
+      break;
+    case FT_UNSIGNED:     
+      convert_to_long_ex(element);
+      AFFIX(ap, t)->f_unsigned = (unsigned) (*element)->value.lval; 
+      break;
+    case FT_SEQUENCE:
+    case FT_LONG:         
+      convert_to_long_ex(element);
+      AFFIX(ap, t)->f_long     = (long) (*element)->value.lval; 
+      break;
+    case FT_DATE:         
+      convert_to_long_ex(element);
+      AFFIX(ap, t)->f_date     = (long) (*element)->value.lval; 
+      break;
+    case FT_FLOAT:        
+      convert_to_double_ex(element);
+      AFFIX(ap, t)->f_float    = (float) (*element)->value.dval; 
+      break;
+    case FT_DOUBLE:       
+      convert_to_double_ex(element);
+      AFFIX(ap, t)->f_double   = (double) (*element)->value.dval; 
+      break;
+    case FT_STRING: case FT_DEUTSCH: case FT_CHAR:      
+        convert_to_string_ex(element);
+        afput(ap, t, (field *)0, (*element)->value.str.val); 
+        break;
+    case FT_TIMESTAMP:
+      /* TODO
+      str2timestamp(SvPV(sv, na), (timestamp *)AFFIX(ap, t));
+      */
+      break;
+    case FT_BINARY:
+    case FT_BLOB:
+    case FT_MEMO:
+      break;
+    }
+  } while (ap++, --deg);
+  return 0;
 } 
 
 
@@ -107,56 +107,56 @@ tuple2var(relf * r, tuple * t, zval **zv)
     register attribute *ap ;
     unsigned deg ;
     char buf[20];
-		zval *element;
+    zval *element;
     
-		zval_dtor(*zv);
-		if (array_init(*zv) == FAILURE) {
-			return 1;
-		}
+    zval_dtor(*zv);
+    if (array_init(*zv) == FAILURE) {
+      return 1;
+    }
 
     ap = r->r_atts;
     deg = r->r_rel.rel_deg;
     do {
-			MAKE_STD_ZVAL(element); element->type=IS_NULL;
-
-			switch(ap->att_type) {
-			case  FT_SHORT: 
-				ZVAL_LONG(element, AFFIX(ap, t)->f_short); 
-				break;
-
-			case  FT_UNSIGNED:
-				ZVAL_LONG(element, AFFIX(ap, t)->f_unsigned); 
-				break;
-
-			case  FT_LONG:  
-			case  FT_SEQUENCE:
-				ZVAL_LONG(element, AFFIX(ap, t)->f_long); 
-				break;
-
-			case  FT_FLOAT:  
-				ZVAL_DOUBLE(element, AFFIX(ap, t)->f_float); 
-				break;
-
-			case  FT_DOUBLE:  
-				ZVAL_DOUBLE(element, AFFIX(ap, t)->f_double); 
-				break;
-
-			case FT_STRING: 
-			case FT_DEUTSCH: 
-			case FT_CHAR:
-				ZVAL_STRING(element, AFVAR(ap, t)->f_string, 1);
-				break;
-
-			}
-
-			if(element->type!=IS_NULL)
-				zend_hash_update((*zv)->value.ht,
-								 ap->att_name,
-								 strlen(ap->att_name)+1,
-								 (void *)&element,
-								 sizeof(zval*),
-								 NULL);
-	
+      MAKE_STD_ZVAL(element); element->type=IS_NULL;
+
+      switch(ap->att_type) {
+      case  FT_SHORT: 
+        ZVAL_LONG(element, AFFIX(ap, t)->f_short); 
+        break;
+
+      case  FT_UNSIGNED:
+        ZVAL_LONG(element, AFFIX(ap, t)->f_unsigned); 
+        break;
+
+      case  FT_LONG:  
+      case  FT_SEQUENCE:
+        ZVAL_LONG(element, AFFIX(ap, t)->f_long); 
+        break;
+
+      case  FT_FLOAT:  
+        ZVAL_DOUBLE(element, AFFIX(ap, t)->f_float); 
+        break;
+
+      case  FT_DOUBLE:  
+        ZVAL_DOUBLE(element, AFFIX(ap, t)->f_double); 
+        break;
+
+      case FT_STRING: 
+      case FT_DEUTSCH: 
+      case FT_CHAR:
+        ZVAL_STRING(element, AFVAR(ap, t)->f_string, 1);
+        break;
+
+      }
+
+      if(element->type!=IS_NULL)
+        zend_hash_update((*zv)->value.ht,
+                 ap->att_name,
+                 strlen(ap->att_name)+1,
+                 (void *)&element,
+                 sizeof(zval*),
+                 NULL);
+  
     } while (ap++, --deg);
     return 0;
 } 
@@ -164,120 +164,120 @@ tuple2var(relf * r, tuple * t, zval **zv)
 static constraint *
 ary2constr(relf * r, zval** constr)
 {
-	attribute *ap;
-	static constraint c;
-	int len;
-	int alen;
-	field *f;
-	enum scalop sop;
-	int n_elems;
-	int n;
-	char * dom;
-	char * val;
-	char * op;
-	zval **zdata;
-
-	/* init first */
-	db_coninit(r, &c);
-
-	if ((*constr)->type != IS_ARRAY) {
-		php_error(E_WARNING, "Constraint is not an array");
-		return NULL;
-	}
-
-	zend_hash_internal_pointer_reset(_HASH(constr));
-	if(zend_hash_get_current_data(_HASH(constr), (void **)&zdata)!=SUCCESS) {
-		php_error(E_WARNING, "Constraint array is empty");
-		return NULL;
-	}
-	
-	switch((*zdata)->type) {
-	case IS_STRING: /* constraints in plain string array */
-		if (_HASH(constr)->nNumOfElements%3) {
-			php_error(E_WARNING, "Constraint array has to have triples of strings");
-			return NULL;
-		}
-
-		do {
-			convert_to_string_ex(zdata);
-			dom = _STRING(zdata);
-			zend_hash_move_forward(_HASH(constr));
-			zend_hash_get_current_data(_HASH(constr), (void **)&zdata);
-			convert_to_string_ex(zdata);
-			op  = _STRING(zdata);
-			zend_hash_move_forward(_HASH(constr));
-			zend_hash_get_current_data(_HASH(constr), (void **)&zdata);
-			convert_to_string_ex(zdata);
-			val = _STRING(zdata);
-			zend_hash_move_forward(_HASH(constr));
-			
-			if (!(ap = (attribute *) attno (r, dom))) {
-				fprintf(stderr, "Invalid domain \"%s\"\n", dom);
-				return 0;
-			}
-
-			/* operator */
-			string_to_scalop(op, &sop);
-			
-			/* value */
-			f = string_to_field(val, ap, 0);
-			
-			(void) db_constrain(r, &c, dom, sop, f ? f : (field *) val);
-		} while(SUCCESS==zend_hash_get_current_data(_HASH(constr), (void **)&zdata));
-		
-		break;
-	case IS_ARRAY:
-		{
-			zval **entry;
-			for(zend_hash_internal_pointer_reset(_HASH(constr));
-					SUCCESS==zend_hash_get_current_data(_HASH(constr), (void **)&zdata);
-					zend_hash_move_forward(_HASH(constr))) {
-				if(!((*zdata)->type==IS_ARRAY)) {
-					php_error(E_WARNING, "Constraint array element not an array");
-					return NULL;
-				}
-				if(_HASH(zdata)->nNumOfElements!=3) {
-					php_error(E_WARNING, "Constraint array element not an array of size 3");
-					return NULL;
-				}				
-
-				zend_hash_internal_pointer_reset(_HASH(zdata));
-				zend_hash_get_current_data(_HASH(zdata), (void **)&entry);
-				convert_to_string_ex(entry);
-				dom=_STRING(entry);
-
-				zend_hash_move_forward(_HASH(zdata));
-				zend_hash_get_current_data(_HASH(zdata), (void **)&entry);
-				convert_to_string_ex(entry);
-				op=_STRING(entry);
-
-				zend_hash_move_forward(_HASH(zdata));				
-				zend_hash_get_current_data(_HASH(zdata), (void **)&entry);
-				convert_to_string_ex(entry);
-				val=_STRING(entry);
-
-				if (!(ap = (attribute *) attno (r, dom))) {
-					fprintf(stderr, "Invalid domain \"%s\"\n", dom);
-					return 0;
-				}
-
-				/* operator */
-				string_to_scalop(op, &sop);
-				
-				/* value */
-				f = string_to_field(val, ap, 0);
-
-				(void) db_constrain(r, &c, dom, sop, f ? f : (field *) val);
-			}
-							
-		}
-		break;
-	default:
-		/* TODO error-handling */
-		return NULL;
-	}
-
-	return &c;
+  attribute *ap;
+  static constraint c;
+  int len;
+  int alen;
+  field *f;
+  enum scalop sop;
+  int n_elems;
+  int n;
+  char * dom;
+  char * val;
+  char * op;
+  zval **zdata;
+
+  /* init first */
+  db_coninit(r, &c);
+
+  if ((*constr)->type != IS_ARRAY) {
+    php_error(E_WARNING, "Constraint is not an array");
+    return NULL;
+  }
+
+  zend_hash_internal_pointer_reset(_HASH(constr));
+  if(zend_hash_get_current_data(_HASH(constr), (void **)&zdata)!=SUCCESS) {
+    php_error(E_WARNING, "Constraint array is empty");
+    return NULL;
+  }
+  
+  switch((*zdata)->type) {
+  case IS_STRING: /* constraints in plain string array */
+    if (_HASH(constr)->nNumOfElements%3) {
+      php_error(E_WARNING, "Constraint array has to have triples of strings");
+      return NULL;
+    }
+
+    do {
+      convert_to_string_ex(zdata);
+      dom = _STRING(zdata);
+      zend_hash_move_forward(_HASH(constr));
+      zend_hash_get_current_data(_HASH(constr), (void **)&zdata);
+      convert_to_string_ex(zdata);
+      op  = _STRING(zdata);
+      zend_hash_move_forward(_HASH(constr));
+      zend_hash_get_current_data(_HASH(constr), (void **)&zdata);
+      convert_to_string_ex(zdata);
+      val = _STRING(zdata);
+      zend_hash_move_forward(_HASH(constr));
+      
+      if (!(ap = (attribute *) attno (r, dom))) {
+        fprintf(stderr, "Invalid domain \"%s\"\n", dom);
+        return 0;
+      }
+
+      /* operator */
+      string_to_scalop(op, &sop);
+      
+      /* value */
+      f = string_to_field(val, ap, 0);
+      
+      (void) db_constrain(r, &c, dom, sop, f ? f : (field *) val);
+    } while(SUCCESS==zend_hash_get_current_data(_HASH(constr), (void **)&zdata));
+    
+    break;
+  case IS_ARRAY:
+    {
+      zval **entry;
+      for(zend_hash_internal_pointer_reset(_HASH(constr));
+          SUCCESS==zend_hash_get_current_data(_HASH(constr), (void **)&zdata);
+          zend_hash_move_forward(_HASH(constr))) {
+        if(!((*zdata)->type==IS_ARRAY)) {
+          php_error(E_WARNING, "Constraint array element not an array");
+          return NULL;
+        }
+        if(_HASH(zdata)->nNumOfElements!=3) {
+          php_error(E_WARNING, "Constraint array element not an array of size 3");
+          return NULL;
+        }       
+
+        zend_hash_internal_pointer_reset(_HASH(zdata));
+        zend_hash_get_current_data(_HASH(zdata), (void **)&entry);
+        convert_to_string_ex(entry);
+        dom=_STRING(entry);
+
+        zend_hash_move_forward(_HASH(zdata));
+        zend_hash_get_current_data(_HASH(zdata), (void **)&entry);
+        convert_to_string_ex(entry);
+        op=_STRING(entry);
+
+        zend_hash_move_forward(_HASH(zdata));       
+        zend_hash_get_current_data(_HASH(zdata), (void **)&entry);
+        convert_to_string_ex(entry);
+        val=_STRING(entry);
+
+        if (!(ap = (attribute *) attno (r, dom))) {
+          fprintf(stderr, "Invalid domain \"%s\"\n", dom);
+          return 0;
+        }
+
+        /* operator */
+        string_to_scalop(op, &sop);
+        
+        /* value */
+        f = string_to_field(val, ap, 0);
+
+        (void) db_constrain(r, &c, dom, sop, f ? f : (field *) val);
+      }
+              
+    }
+    break;
+  default:
+    /* TODO error-handling */
+    return NULL;
+  }
+
+  return &c;
 }
 
 
@@ -285,28 +285,28 @@ ary2constr(relf * r, zval** constr)
    Add a tuple to a relation */
 PHP_FUNCTION(dbplus_add)
 {
-	zval **relation, **data, **element;
-	enum errorcond stat = ERR_UNKNOWN;
-	relf *r;
-	tuple t;
+  zval **relation, **data, **element;
+  enum errorcond stat = ERR_UNKNOWN;
+  relf *r;
+  tuple t;
 
 
- 	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &data) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &data) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
-	convert_to_array_ex(data);
-	
-	if(var2tuple(r, data, &t))
-		RETURN_LONG(ERR_UNKNOWN);
+  DBPLUS_FETCH_RESOURCE(r, relation);
+  convert_to_array_ex(data);
+  
+  if(var2tuple(r, data, &t))
+    RETURN_LONG(ERR_UNKNOWN);
 
-	stat=cdb_add(r, &t);
-	if(stat==ERR_NOERR) {
-		tuple2var(r, &t, data);
-	}
+  stat=cdb_add(r, &t);
+  if(stat==ERR_NOERR) {
+    tuple2var(r, &t, data);
+  }
 
-	RETURN_LONG(stat);
+  RETURN_LONG(stat);
 }
 /* }}} */
 
@@ -314,39 +314,39 @@ PHP_FUNCTION(dbplus_add)
    Perform AQL query */
 PHP_FUNCTION(dbplus_aql)
 {
-	int argc;
-	zval **query, **server, **dbpath;
-	relf *r;
-
-	argc = ZEND_NUM_ARGS();
-	if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &query, &server, &dbpath) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-	
-	switch (argc) {
-	case 3:
-		convert_to_string_ex(dbpath);
-		php_error(E_WARNING, "Arg dbpath: %s", _STRING(dbpath));
-		/* Fall-through. */
-	case 2:
-		convert_to_string_ex(server);
-		php_error(E_WARNING, "Arg server: %s", _STRING(server));
-		/* Fall-through. */
-	case 1:
-		convert_to_string_ex(query);
-		php_error(E_WARNING, "Arg query: %s", _STRING(query));
-		break;
-	}
-	
-	r = cdb_aql((argc>=2)?_STRING(server):"localhost",
-								 _STRING(query),
-								 (argc==3)?_STRING(dbpath):NULL);
-	if(r == NULL) {
-		/* TODO error handling */
-		RETURN_FALSE;
-	}
-	
-	ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);	
+  int argc;
+  zval **query, **server, **dbpath;
+  relf *r;
+
+  argc = ZEND_NUM_ARGS();
+  if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &query, &server, &dbpath) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
+  
+  switch (argc) {
+  case 3:
+    convert_to_string_ex(dbpath);
+    php_error(E_WARNING, "Arg dbpath: %s", _STRING(dbpath));
+    /* Fall-through. */
+  case 2:
+    convert_to_string_ex(server);
+    php_error(E_WARNING, "Arg server: %s", _STRING(server));
+    /* Fall-through. */
+  case 1:
+    convert_to_string_ex(query);
+    php_error(E_WARNING, "Arg query: %s", _STRING(query));
+    break;
+  }
+  
+  r = cdb_aql((argc>=2)?_STRING(server):"localhost",
+                 _STRING(query),
+                 (argc==3)?_STRING(dbpath):NULL);
+  if(r == NULL) {
+    /* TODO error handling */
+    RETURN_FALSE;
+  }
+  
+  ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);  
 }
 /* }}} */
 
@@ -354,31 +354,31 @@ PHP_FUNCTION(dbplus_aql)
    Get/Set database virtual current directory */
 PHP_FUNCTION(dbplus_chdir)
 {
-	int argc;
-	char *p;
-	zval **newdir;
-
-	argc = ZEND_NUM_ARGS();
-	switch(argc) {
-	case 0: 
-		break;
-	case 1:
-		if(zend_get_parameters_ex(1, &newdir) == FAILURE) {
-			WRONG_PARAM_COUNT;
-		} else {
-			convert_to_string_ex(newdir);
-		}
-		break;
-	default:
-		WRONG_PARAM_COUNT;
-	}
-
-	p = cdb_chdir((argc)?_STRING(newdir):NULL);
-	if(p) {
-		RETURN_STRING(p, 1);
-	} else {
-		RETURN_FALSE;
-	}
+  int argc;
+  char *p;
+  zval **newdir;
+
+  argc = ZEND_NUM_ARGS();
+  switch(argc) {
+  case 0: 
+    break;
+  case 1:
+    if(zend_get_parameters_ex(1, &newdir) == FAILURE) {
+      WRONG_PARAM_COUNT;
+    } else {
+      convert_to_string_ex(newdir);
+    }
+    break;
+  default:
+    WRONG_PARAM_COUNT;
+  }
+
+  p = cdb_chdir((argc)?_STRING(newdir):NULL);
+  if(p) {
+    RETURN_STRING(p, 1);
+  } else {
+    RETURN_FALSE;
+  }
 }
 /* }}} */
 
@@ -386,17 +386,17 @@ PHP_FUNCTION(dbplus_chdir)
    Close a relation */
 PHP_FUNCTION(dbplus_close)
 {
-	relf *r;
-	zval **relation;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  relf *r;
+  zval **relation;
+  if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	zend_list_delete((*relation)->value.lval);	
+  zend_list_delete((*relation)->value.lval);  
 
-	RETURN_TRUE;
+  RETURN_TRUE;
 }
 /* }}} */
 
@@ -404,23 +404,23 @@ PHP_FUNCTION(dbplus_close)
    Get current tuple from relation */
 PHP_FUNCTION(dbplus_curr)
 {
-	zval **relation, **tname;
-	relf *r;
-	tuple t;
-	int stat;
-
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &tname) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	DBPLUS_FETCH_RESOURCE(r, relation);
-	
-	stat = cdb_current(r, &t);
-	if(stat==ERR_NOERR) {
-		tuple2var(r, &t, tname);
-	}
-
-	RETURN_LONG(stat);
+  zval **relation, **tname;
+  relf *r;
+  tuple t;
+  int stat;
+
+  if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &tname) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
+
+  DBPLUS_FETCH_RESOURCE(r, relation);
+  
+  stat = cdb_current(r, &t);
+  if(stat==ERR_NOERR) {
+    tuple2var(r, &t, tname);
+  }
+
+  RETURN_LONG(stat);
 }
 /* }}} */
 
@@ -428,24 +428,24 @@ PHP_FUNCTION(dbplus_curr)
    Get error string for given errorcode or last error */
 PHP_FUNCTION(dbplus_errcode)
 {
-	zval **err;
-	int errno;
-	
-	switch (ZEND_NUM_ARGS()) {
-	case 0:
-		errno=-1;
-		break;
-	case 1:
-		if( zend_get_parameters_ex(1, &err) == FAILURE){
-			WRONG_PARAM_COUNT;
-		}
-		convert_to_long_ex(err);
-		errno = _INT(err);
-	}
-	
-	if(errno==-1) errno = Acc_error;
-
-	RETURN_STRING(dbErrorMsg(errno, NULL), 1); 
+  zval **err;
+  int errno;
+  
+  switch (ZEND_NUM_ARGS()) {
+  case 0:
+    errno=-1;
+    break;
+  case 1:
+    if( zend_get_parameters_ex(1, &err) == FAILURE){
+      WRONG_PARAM_COUNT;
+    }
+    convert_to_long_ex(err);
+    errno = _INT(err);
+  }
+  
+  if(errno==-1) errno = Acc_error;
+
+  RETURN_STRING(dbErrorMsg(errno, NULL), 1); 
 }
 /* }}} */
 
@@ -453,7 +453,7 @@ PHP_FUNCTION(dbplus_errcode)
    Get error code for last operation */
 PHP_FUNCTION(dbplus_errno)
 {
-	RETURN_LONG(Acc_error);
+  RETURN_LONG(Acc_error);
 }
 /* }}} */
 
@@ -461,37 +461,37 @@ PHP_FUNCTION(dbplus_errno)
    Set a constraint on a relation*/
 PHP_FUNCTION(dbplus_find)
 {
-	relf *r;
-	zval **relation, **constr, **data;
-	constraint *c;
-	tuple t;
-	int stat;
+  relf *r;
+  zval **relation, **constr, **data;
+  constraint *c;
+  tuple t;
+  int stat;
 
-	if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &relation, &constr, &data) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &relation, &constr, &data) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation); 
+  DBPLUS_FETCH_RESOURCE(r, relation); 
 
-	if ((*constr)->type != IS_ARRAY) {
-		php_error(E_WARNING, "Constraint is not an array");
-		RETURN_LONG(ERR_UNKNOWN);
-	}
+  if ((*constr)->type != IS_ARRAY) {
+    php_error(E_WARNING, "Constraint is not an array");
+    RETURN_LONG(ERR_UNKNOWN);
+  }
 
-	convert_to_array_ex(data);
+  convert_to_array_ex(data);
 
-	c = ary2constr(r, constr);
-	
-	if (!c){
-		RETURN_LONG(ERR_USER);
-	}
+  c = ary2constr(r, constr);
+  
+  if (!c){
+    RETURN_LONG(ERR_USER);
+  }
 
-	stat = cdb_find(r, &t, c);
-	
-	if(stat==ERR_NOERR)
-		tuple2var(r, &t, data);	
+  stat = cdb_find(r, &t, c);
+  
+  if(stat==ERR_NOERR)
+    tuple2var(r, &t, data); 
 
-	RETURN_LONG(stat);
+  RETURN_LONG(stat);
 }
 /* }}} */
 
@@ -499,23 +499,23 @@ PHP_FUNCTION(dbplus_find)
    Get first tuple from relation */
 PHP_FUNCTION(dbplus_first)
 {
-	zval **relation, **tname;
-	relf *r;
-	tuple t;
-	int stat;
-
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &tname) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	DBPLUS_FETCH_RESOURCE(r, relation);
-	
-	stat = cdb_first(r, &t);
-	if(stat==ERR_NOERR) {
-		tuple2var(r, &t, tname);
-	}
-
-	RETURN_LONG(stat);
+  zval **relation, **tname;
+  relf *r;
+  tuple t;
+  int stat;
+
+  if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &tname) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
+
+  DBPLUS_FETCH_RESOURCE(r, relation);
+  
+  stat = cdb_first(r, &t);
+  if(stat==ERR_NOERR) {
+    tuple2var(r, &t, tname);
+  }
+
+  RETURN_LONG(stat);
 }
 /* }}} */
 
@@ -523,15 +523,15 @@ PHP_FUNCTION(dbplus_first)
    ??? */
 PHP_FUNCTION(dbplus_flush)
 {
-	relf *r;
-	zval **relation;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  relf *r;
+  zval **relation;
+  if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	RETURN_LONG(cdb_flush(r));
+  RETURN_LONG(cdb_flush(r));
 }
 /* }}} */
 
@@ -539,7 +539,7 @@ PHP_FUNCTION(dbplus_flush)
    Free all locks held by this client */
 PHP_FUNCTION(dbplus_freealllocks)
 {
-	RETURN_LONG(cdbFreeAllLocks());
+  RETURN_LONG(cdbFreeAllLocks());
 }
 /* }}} */
 
@@ -548,25 +548,25 @@ PHP_FUNCTION(dbplus_freealllocks)
    Release write lock on tuple */
 PHP_FUNCTION(dbplus_freelock)
 {
-	zval **relation, **data, **element;
-	enum errorcond stat = ERR_UNKNOWN;
-	relf *r;
-	tuple t;
+  zval **relation, **data, **element;
+  enum errorcond stat = ERR_UNKNOWN;
+  relf *r;
+  tuple t;
 
- 	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &data) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &data) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	convert_to_array_ex(data);
-	
-	if(var2tuple(r, data, &t))
-		RETURN_LONG(ERR_UNKNOWN);
+  convert_to_array_ex(data);
+  
+  if(var2tuple(r, data, &t))
+    RETURN_LONG(ERR_UNKNOWN);
 
-	stat=cdb_freelock(r, &t);
+  stat=cdb_freelock(r, &t);
 
-	RETURN_LONG(stat);
+  RETURN_LONG(stat);
 }
 /* }}} */
 
@@ -574,15 +574,15 @@ PHP_FUNCTION(dbplus_freelock)
    Free all locks on given relation */
 PHP_FUNCTION(dbplus_freerlocks)
 {
-	relf *r;
-	zval **relation;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  relf *r;
+  zval **relation;
+  if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	RETURN_LONG(cdb_freerlocks(r));
+  RETURN_LONG(cdb_freerlocks(r));
 }
 /* }}} */
 
@@ -590,25 +590,25 @@ PHP_FUNCTION(dbplus_freerlocks)
    Request locking of tuple */
 PHP_FUNCTION(dbplus_getlock)
 {
-	zval **relation, **data, **element;
-	enum errorcond stat = ERR_UNKNOWN;
-	relf *r;
-	tuple t;
+  zval **relation, **data, **element;
+  enum errorcond stat = ERR_UNKNOWN;
+  relf *r;
+  tuple t;
 
- 	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &data) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &data) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	convert_to_array_ex(data);
-	
-	if(var2tuple(r, data, &t))
-		RETURN_LONG(ERR_UNKNOWN);
+  convert_to_array_ex(data);
+  
+  if(var2tuple(r, data, &t))
+    RETURN_LONG(ERR_UNKNOWN);
 
-	stat=cdb_getlock(r, &t);
+  stat=cdb_getlock(r, &t);
 
-	RETURN_LONG(stat);
+  RETURN_LONG(stat);
 }
 /* }}} */
 
@@ -616,23 +616,23 @@ PHP_FUNCTION(dbplus_getlock)
    Get a id number unique to a relation */
 PHP_FUNCTION(dbplus_getunique)
 {
-	relf *r;
-	zval **relation, **uniqueid;
-	long l;
-	int stat;
-	
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &uniqueid) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-	
-	DBPLUS_FETCH_RESOURCE(r, relation);
-	
-	stat = cdb_getunique(r, &l, 1);
-	if(!stat) {
-		ZVAL_LONG(*uniqueid,l);
-	} 
-
-	RETURN_LONG(stat);
+  relf *r;
+  zval **relation, **uniqueid;
+  long l;
+  int stat;
+  
+  if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &uniqueid) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
+  
+  DBPLUS_FETCH_RESOURCE(r, relation);
+  
+  stat = cdb_getunique(r, &l, 1);
+  if(!stat) {
+    ZVAL_LONG(*uniqueid,l);
+  } 
+
+  RETURN_LONG(stat);
 }
 /* }}} */
 
@@ -640,43 +640,43 @@ PHP_FUNCTION(dbplus_getunique)
    ??? */
 PHP_FUNCTION(dbplus_info)
 {
-	zval **relation, **key, **result, *element;
-	relf *r;
-	register attribute *ap;
-	unsigned deg;
-
-	if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &relation, &key, &result) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	DBPLUS_FETCH_RESOURCE(r, relation);
-	
-	ap = r->r_atts;
-	deg = r->r_rel.rel_deg;
-
-	convert_to_string_ex(key);
-	
-	zval_dtor(*result);
-	if (array_init(*result) == FAILURE)
-		RETURN_LONG(ERR_USER);	
-
-	if(!strcmp("atts", (*key)->value.str.val)) {
-		do {
-			MAKE_STD_ZVAL(element); 
-
-			ZVAL_STRING(element, ap->att_name, 1);
-
-			zend_hash_update((*result)->value.ht,
-											 ap->att_name,
-											 strlen(ap->att_name)+1,
-											 (void *)&element,
-											 sizeof(zval*),
-											 NULL);
-		} while (ap++, deg--);
-		RETURN_LONG(ERR_NOERR);
-	}
-
-	RETURN_LONG(ERR_USER);
+  zval **relation, **key, **result, *element;
+  relf *r;
+  register attribute *ap;
+  unsigned deg;
+
+  if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &relation, &key, &result) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
+
+  DBPLUS_FETCH_RESOURCE(r, relation);
+  
+  ap = r->r_atts;
+  deg = r->r_rel.rel_deg;
+
+  convert_to_string_ex(key);
+  
+  zval_dtor(*result);
+  if (array_init(*result) == FAILURE)
+    RETURN_LONG(ERR_USER);  
+
+  if(!strcmp("atts", (*key)->value.str.val)) {
+    do {
+      MAKE_STD_ZVAL(element); 
+
+      ZVAL_STRING(element, ap->att_name, 1);
+
+      zend_hash_update((*result)->value.ht,
+                       ap->att_name,
+                       strlen(ap->att_name)+1,
+                       (void *)&element,
+                       sizeof(zval*),
+                       NULL);
+    } while (ap++, deg--);
+    RETURN_LONG(ERR_NOERR);
+  }
+
+  RETURN_LONG(ERR_USER);
 }
 /* }}} */
 
@@ -684,23 +684,23 @@ PHP_FUNCTION(dbplus_info)
    Get last tuple from relation */
 PHP_FUNCTION(dbplus_last)
 {
-	zval **relation, **tname;
-	relf *r;
-	tuple t;
-	int stat;
-
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &tname) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	DBPLUS_FETCH_RESOURCE(r, relation);
-	
-	stat = cdb_last(r, &t);
-	if(stat==ERR_NOERR) {
-		tuple2var(r, &t, tname);
-	}
-
-	RETURN_LONG(stat);
+  zval **relation, **tname;
+  relf *r;
+  tuple t;
+  int stat;
+
+  if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &tname) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
+
+  DBPLUS_FETCH_RESOURCE(r, relation);
+  
+  stat = cdb_last(r, &t);
+  if(stat==ERR_NOERR) {
+    tuple2var(r, &t, tname);
+  }
+
+  RETURN_LONG(stat);
 }
 /* }}} */
 
@@ -709,15 +709,15 @@ PHP_FUNCTION(dbplus_last)
    Request write lock on relation */
 PHP_FUNCTION(dbplus_lockrel)
 {
-	relf *r;
-	zval **relation;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  relf *r;
+  zval **relation;
+  if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	RETURN_LONG(cdb_lockrel(r));
+  RETURN_LONG(cdb_lockrel(r));
 }
 /* }}} */
 
@@ -725,23 +725,23 @@ PHP_FUNCTION(dbplus_lockrel)
    Get next tuple from relation */
 PHP_FUNCTION(dbplus_next)
 {
-	zval **relation, **tname, *element;
-	relf *r;
-	tuple t;
-	int stat;
-	
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &tname) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-	
-	DBPLUS_FETCH_RESOURCE(r, relation);
-	
-	stat = cdb_next(r, &t);
-	if(stat==ERR_NOERR) {
-		tuple2var(r, &t, tname);
-	}
-
-	RETURN_LONG(stat);
+  zval **relation, **tname, *element;
+  relf *r;
+  tuple t;
+  int stat;
+  
+  if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &tname) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
+  
+  DBPLUS_FETCH_RESOURCE(r, relation);
+  
+  stat = cdb_next(r, &t);
+  if(stat==ERR_NOERR) {
+    tuple2var(r, &t, tname);
+  }
+
+  RETURN_LONG(stat);
 }
 /* }}} */
 
@@ -749,21 +749,21 @@ PHP_FUNCTION(dbplus_next)
    Open a relation file */
 PHP_FUNCTION(dbplus_open)
 {
-	relf *r;
-	zval **tname;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &tname) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  relf *r;
+  zval **tname;
+  if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &tname) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	convert_to_string_ex(tname);
+  convert_to_string_ex(tname);
 
-	r = cdb_open((*tname)->value.str.val, 1, 1);
-	if(r == NULL) {
-		/* TODO error handling */
-		RETURN_FALSE;
-	}
+  r = cdb_open((*tname)->value.str.val, 1, 1);
+  if(r == NULL) {
+    /* TODO error handling */
+    RETURN_FALSE;
+  }
 
-	ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
+  ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
 }
 /* }}} */
 
@@ -771,23 +771,23 @@ PHP_FUNCTION(dbplus_open)
    Get previous tuple from relation */
 PHP_FUNCTION(dbplus_prev)
 {
-	zval **relation, **tname;
-	relf *r;
-	tuple t;
-	int stat;
-
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &tname) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	DBPLUS_FETCH_RESOURCE(r, relation);
-	
-	stat = cdb_previous(r, &t);
-	if(stat==ERR_NOERR) {
-		tuple2var(r, &t, tname);
-	}
-
-	RETURN_LONG(stat);
+  zval **relation, **tname;
+  relf *r;
+  tuple t;
+  int stat;
+
+  if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &tname) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
+
+  DBPLUS_FETCH_RESOURCE(r, relation);
+  
+  stat = cdb_previous(r, &t);
+  if(stat==ERR_NOERR) {
+    tuple2var(r, &t, tname);
+  }
+
+  RETURN_LONG(stat);
 }
 /* }}} */
 
@@ -795,19 +795,19 @@ PHP_FUNCTION(dbplus_prev)
     */
 PHP_FUNCTION(dbplus_rchperm)
 {
-	relf *r;
-	zval **relation, **mask, **user, **group;
-	if (ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, &relation, &mask, &user, &group) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  relf *r;
+  zval **relation, **mask, **user, **group;
+  if (ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, &relation, &mask, &user, &group) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	convert_to_long_ex(mask);
-	convert_to_string_ex(user);
-	convert_to_string_ex(group);
+  convert_to_long_ex(mask);
+  convert_to_string_ex(user);
+  convert_to_string_ex(group);
 
-	RETURN_LONG(cdbRchperm(r, _INT(mask), _STRING(user), _STRING(group)));
+  RETURN_LONG(cdbRchperm(r, _INT(mask), _STRING(user), _STRING(group)));
 }
 /* }}} */
 
@@ -815,44 +815,44 @@ PHP_FUNCTION(dbplus_rchperm)
     */
 PHP_FUNCTION(dbplus_rcreate)
 {
-	zval **name, **domlist, **overwrite;
-	relf *r=NULL;
-	int flag, ndoms, argc = ZEND_NUM_ARGS();
-	attdef *at0;
-
-	switch(argc) {
-	case 3:
-		if(zend_get_parameters_ex(3, &name, &domlist, &overwrite) == FAILURE) {
-			WRONG_PARAM_COUNT;
-		}			
-		convert_to_long_ex(overwrite);
-		flag=_INT(overwrite);
-		break;
-	case 2:
-		if(zend_get_parameters_ex(3, &name, &domlist) == FAILURE) {
-			WRONG_PARAM_COUNT;
-		}
-		flag=0;
-		break;
-	default:
-		WRONG_PARAM_COUNT;
-		break;
-	}
-
-	convert_to_string_ex(name);
-	convert_to_string_ex(domlist);
-
-	at0 = create2att(_STRING(domlist), &ndoms);
-	if (at0) {
-		r = cdbRcreate(_STRING(name), 0666, 0, ndoms, at0, flag);
-		dbxfree((char *) at0);
-	}
-	if(r == NULL) {
-		/* TODO error handling */
-		RETURN_FALSE;
-	}
-
-	ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
+  zval **name, **domlist, **overwrite;
+  relf *r=NULL;
+  int flag, ndoms, argc = ZEND_NUM_ARGS();
+  attdef *at0;
+
+  switch(argc) {
+  case 3:
+    if(zend_get_parameters_ex(3, &name, &domlist, &overwrite) == FAILURE) {
+      WRONG_PARAM_COUNT;
+    }     
+    convert_to_long_ex(overwrite);
+    flag=_INT(overwrite);
+    break;
+  case 2:
+    if(zend_get_parameters_ex(3, &name, &domlist) == FAILURE) {
+      WRONG_PARAM_COUNT;
+    }
+    flag=0;
+    break;
+  default:
+    WRONG_PARAM_COUNT;
+    break;
+  }
+
+  convert_to_string_ex(name);
+  convert_to_string_ex(domlist);
+
+  at0 = create2att(_STRING(domlist), &ndoms);
+  if (at0) {
+    r = cdbRcreate(_STRING(name), 0666, 0, ndoms, at0, flag);
+    dbxfree((char *) at0);
+  }
+  if(r == NULL) {
+    /* TODO error handling */
+    RETURN_FALSE;
+  }
+
+  ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
 }
 /* }}} */
 
@@ -860,39 +860,39 @@ PHP_FUNCTION(dbplus_rcreate)
     */
 PHP_FUNCTION(dbplus_rcrtexact)
 {
-	zval **name, **relation, **overwrite;
-	relf *r;
-	int f,argc = ZEND_NUM_ARGS();
-
-	switch(argc) {
-	case 3:
-		if(zend_get_parameters_ex(3, &name, &relation, &overwrite) == FAILURE) {
-			WRONG_PARAM_COUNT;
-		}			
-		convert_to_long_ex(overwrite);
-		f=_INT(overwrite);
-		break;
-	case 2:
-		if(zend_get_parameters_ex(3, &name, &relation) == FAILURE) {
-			WRONG_PARAM_COUNT;
-		}
-		f=0;
-		break;
-	default:
-		WRONG_PARAM_COUNT;
-		break;
-	}
-
-	convert_to_string_ex(name);
-	DBPLUS_FETCH_RESOURCE(r, relation);
-
-	r = cdbRcrtexact(_STRING(name), 0666, r, f);
-	if(r == NULL) {
-		/* TODO error handling */
-		RETURN_FALSE;
-	}
-
-	ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
+  zval **name, **relation, **overwrite;
+  relf *r;
+  int f,argc = ZEND_NUM_ARGS();
+
+  switch(argc) {
+  case 3:
+    if(zend_get_parameters_ex(3, &name, &relation, &overwrite) == FAILURE) {
+      WRONG_PARAM_COUNT;
+    }     
+    convert_to_long_ex(overwrite);
+    f=_INT(overwrite);
+    break;
+  case 2:
+    if(zend_get_parameters_ex(3, &name, &relation) == FAILURE) {
+      WRONG_PARAM_COUNT;
+    }
+    f=0;
+    break;
+  default:
+    WRONG_PARAM_COUNT;
+    break;
+  }
+
+  convert_to_string_ex(name);
+  DBPLUS_FETCH_RESOURCE(r, relation);
+
+  r = cdbRcrtexact(_STRING(name), 0666, r, f);
+  if(r == NULL) {
+    /* TODO error handling */
+    RETURN_FALSE;
+  }
+
+  ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
 }
 /* }}} */
 
@@ -900,39 +900,39 @@ PHP_FUNCTION(dbplus_rcrtexact)
     */
 PHP_FUNCTION(dbplus_rcrtlike)
 {
-	zval **name, **relation, **overwrite;
-	relf *r;
-	int f,argc = ZEND_NUM_ARGS();
-
-	switch(argc) {
-	case 3:
-		if(zend_get_parameters_ex(3, &name, &relation, &overwrite) == FAILURE) {
-			WRONG_PARAM_COUNT;
-		}			
-		convert_to_long_ex(overwrite);
-		f=_INT(overwrite);
-		break;
-	case 2:
-		if(zend_get_parameters_ex(3, &name, &relation) == FAILURE) {
-			WRONG_PARAM_COUNT;
-		}
-		f=0;
-		break;
-	default:
-		WRONG_PARAM_COUNT;
-		break;
-	}
-
-	convert_to_string_ex(name);
-	DBPLUS_FETCH_RESOURCE(r, relation);
-
-	r = cdbRcrtlike(_STRING(name), 0666, 0, r, f);
-	if(r == NULL) {
-		/* TODO error handling */
-		RETURN_FALSE;
-	}
-
-	ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
+  zval **name, **relation, **overwrite;
+  relf *r;
+  int f,argc = ZEND_NUM_ARGS();
+
+  switch(argc) {
+  case 3:
+    if(zend_get_parameters_ex(3, &name, &relation, &overwrite) == FAILURE) {
+      WRONG_PARAM_COUNT;
+    }     
+    convert_to_long_ex(overwrite);
+    f=_INT(overwrite);
+    break;
+  case 2:
+    if(zend_get_parameters_ex(3, &name, &relation) == FAILURE) {
+      WRONG_PARAM_COUNT;
+    }
+    f=0;
+    break;
+  default:
+    WRONG_PARAM_COUNT;
+    break;
+  }
+
+  convert_to_string_ex(name);
+  DBPLUS_FETCH_RESOURCE(r, relation);
+
+  r = cdbRcrtlike(_STRING(name), 0666, 0, r, f);
+  if(r == NULL) {
+    /* TODO error handling */
+    RETURN_FALSE;
+  }
+
+  ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
 }
 /* }}} */
 
@@ -940,40 +940,40 @@ PHP_FUNCTION(dbplus_rcrtlike)
    Resolve host information for relation */
 PHP_FUNCTION(dbplus_resolve)
 {
-	zval **name, *element;
-	char * host;
-	char * host_path;
-	int sid;
+  zval **name, *element;
+  char * host;
+  char * host_path;
+  int sid;
 
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &name) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &name) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	convert_to_string_ex(name);
+  convert_to_string_ex(name);
 
-	sid = cdb_resolve(_STRING(name), &host, &host_path);
-	if (sid <= 0)
-		RETURN_FALSE;
+  sid = cdb_resolve(_STRING(name), &host, &host_path);
+  if (sid <= 0)
+    RETURN_FALSE;
 
-	if (array_init(return_value) == FAILURE) {
-		RETURN_FALSE;
-	}
+  if (array_init(return_value) == FAILURE) {
+    RETURN_FALSE;
+  }
 
 
-	MAKE_STD_ZVAL(element); element->type=IS_NULL;
-	ZVAL_LONG(element,sid);
-	zend_hash_update(Z_ARRVAL_P(return_value), "sid", 4,
-					  &element, sizeof(zval *), NULL);
+  MAKE_STD_ZVAL(element); element->type=IS_NULL;
+  ZVAL_LONG(element,sid);
+  zend_hash_update(Z_ARRVAL_P(return_value), "sid", 4,
+            &element, sizeof(zval *), NULL);
 
-	MAKE_STD_ZVAL(element); element->type=IS_NULL;
-	ZVAL_STRING(element,host,1);
-	zend_hash_update(Z_ARRVAL_P(return_value), "host", 5,
-					  &element, sizeof(zval *), NULL);
+  MAKE_STD_ZVAL(element); element->type=IS_NULL;
+  ZVAL_STRING(element,host,1);
+  zend_hash_update(Z_ARRVAL_P(return_value), "host", 5,
+            &element, sizeof(zval *), NULL);
 
-	MAKE_STD_ZVAL(element); element->type=IS_NULL;
-	ZVAL_STRING(element,host_path,1);
-	zend_hash_update(Z_ARRVAL_P(return_value), "host_path", 10,
-					  &element, sizeof(zval *), NULL);
+  MAKE_STD_ZVAL(element); element->type=IS_NULL;
+  ZVAL_STRING(element,host_path,1);
+  zend_hash_update(Z_ARRVAL_P(return_value), "host_path", 10,
+            &element, sizeof(zval *), NULL);
 }
 /* }}} */
 
@@ -981,22 +981,22 @@ PHP_FUNCTION(dbplus_resolve)
    ??? */
 PHP_FUNCTION(dbplus_restorepos)
 {
-	zval **relation, **tname;
-	relf *r;
-	tuple t;
-	int stat;
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &tname) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	DBPLUS_FETCH_RESOURCE(r, relation);
-	
-	stat = cdb_next(r, &t);
-	if(stat==ERR_NOERR) {
-		tuple2var(r, &t, tname);
-	}
-
-	RETURN_LONG(stat);
+  zval **relation, **tname;
+  relf *r;
+  tuple t;
+  int stat;
+  if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &tname) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
+
+  DBPLUS_FETCH_RESOURCE(r, relation);
+  
+  stat = cdb_next(r, &t);
+  if(stat==ERR_NOERR) {
+    tuple2var(r, &t, tname);
+  }
+
+  RETURN_LONG(stat);
 }
 /* }}} */
 
@@ -1004,49 +1004,49 @@ PHP_FUNCTION(dbplus_restorepos)
     */
 PHP_FUNCTION(dbplus_rkeys)
 {
-	relf *r, *rnew;
-	zval **relation, **domlist, **zdata;
-	int nkeys=0;
-	char *p, *name=NULL, *keys[40]; /* TODO hardcoded magic number ??? */
-
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &domlist) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	DBPLUS_FETCH_RESOURCE(r, relation);
-
-	if((*domlist)->type == IS_ARRAY) {
-		convert_to_array_ex(domlist);
-		for(zend_hash_internal_pointer_reset(_HASH(domlist));
-				SUCCESS==zend_hash_get_current_data(_HASH(domlist), (void **)&zdata);
-				zend_hash_move_forward(_HASH(domlist))) {
-			if((*zdata)->type==IS_STRING)
-				keys[nkeys++] = _STRING(zdata);
-			else {
-				php_error(E_WARNING, "Domlist array contains non-string value(s)");
-				Acc_error = ERR_USER;
-				RETURN_FALSE;
-			}
-		}
-	} else {
-		convert_to_string_ex(domlist);
-		name = estrdup(_STRING(domlist));
-		while (p = strtok(nkeys ? 0 : name, " \t"))
-			keys[nkeys++] = p;
-	}
-	
-	rnew = cdbRkeys(r, nkeys, keys);
-	if(name) efree(name);
-
-	if(rnew) {
-		/* TODO realy delete old relation resource ? */
-		zend_list_delete((*relation)->value.lval);	
-		
-		ZEND_REGISTER_RESOURCE(return_value, rnew, le_dbplus_relation);
-	} else {
-		/* TODO error reporting */
-		RETURN_FALSE;
-	}
+  relf *r, *rnew;
+  zval **relation, **domlist, **zdata;
+  int nkeys=0;
+  char *p, *name=NULL, *keys[40]; /* TODO hardcoded magic number ??? */
+
+  if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &domlist) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
+
+  DBPLUS_FETCH_RESOURCE(r, relation);
+
+  if((*domlist)->type == IS_ARRAY) {
+    convert_to_array_ex(domlist);
+    for(zend_hash_internal_pointer_reset(_HASH(domlist));
+        SUCCESS==zend_hash_get_current_data(_HASH(domlist), (void **)&zdata);
+        zend_hash_move_forward(_HASH(domlist))) {
+      if((*zdata)->type==IS_STRING)
+        keys[nkeys++] = _STRING(zdata);
+      else {
+        php_error(E_WARNING, "Domlist array contains non-string value(s)");
+        Acc_error = ERR_USER;
+        RETURN_FALSE;
+      }
+    }
+  } else {
+    convert_to_string_ex(domlist);
+    name = estrdup(_STRING(domlist));
+    while (p = strtok(nkeys ? 0 : name, " \t"))
+      keys[nkeys++] = p;
+  }
+  
+  rnew = cdbRkeys(r, nkeys, keys);
+  if(name) efree(name);
+
+  if(rnew) {
+    /* TODO realy delete old relation resource ? */
+    zend_list_delete((*relation)->value.lval);  
+    
+    ZEND_REGISTER_RESOURCE(return_value, rnew, le_dbplus_relation);
+  } else {
+    /* TODO error reporting */
+    RETURN_FALSE;
+  }
 }
 /* }}} */
 
@@ -1054,21 +1054,21 @@ PHP_FUNCTION(dbplus_rkeys)
    Open relation file ... ??? */
 PHP_FUNCTION(dbplus_ropen)
 {
-	relf *r;
-	zval **tname;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &tname) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  relf *r;
+  zval **tname;
+  if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &tname) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	convert_to_string_ex(tname);
+  convert_to_string_ex(tname);
 
-	r = ropen((*tname)->value.str.val, 0, 0);
-	if(r == NULL) {
-		/* TODO error handling */
-		RETURN_FALSE;
-	}
+  r = ropen((*tname)->value.str.val, 0, 0);
+  if(r == NULL) {
+    /* TODO error handling */
+    RETURN_FALSE;
+  }
 
-	ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
+  ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
 }
 /* }}} */
 
@@ -1076,22 +1076,22 @@ PHP_FUNCTION(dbplus_ropen)
     */
 PHP_FUNCTION(dbplus_rquery)
 {
-	relf *r;
-	zval **name, **dbpath;
-	int argc;
-	
-	if (argc <1 || argc>2 || zend_get_parameters_ex(1, &name, &dbpath) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	r = aql_exec(_STRING(name), (argc==2)?_STRING(dbpath):NULL);
-
-	if(!r) {
-		/* TODO error handling */
-		RETURN_FALSE;
-	}
-
-	ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
+  relf *r;
+  zval **name, **dbpath;
+  int argc;
+  
+  if (argc <1 || argc>2 || zend_get_parameters_ex(1, &name, &dbpath) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
+
+  r = aql_exec(_STRING(name), (argc==2)?_STRING(dbpath):NULL);
+
+  if(!r) {
+    /* TODO error handling */
+    RETURN_FALSE;
+  }
+
+  ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);
 }
 /* }}} */
 
@@ -1099,17 +1099,17 @@ PHP_FUNCTION(dbplus_rquery)
     */
 PHP_FUNCTION(dbplus_rrename)
 {
-	relf *r;
-	zval **relation, **name;
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &name) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  relf *r;
+  zval **relation, **name;
+  if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &name) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	convert_to_string_ex(name);
+  convert_to_string_ex(name);
 
-	RETURN_LONG(cdbRrename(r, _STRING(name), 0));
+  RETURN_LONG(cdbRrename(r, _STRING(name), 0));
 }
 /* }}} */
 
@@ -1117,51 +1117,51 @@ PHP_FUNCTION(dbplus_rrename)
     */
 PHP_FUNCTION(dbplus_rsecindex)
 {
-	relf *r, *rnew;
-	zval **relation, **domlist, **compact, **zdata;
-	int nkeys=0;
-	char *p, *name=NULL, *keys[40]; /* TODO hardcoded magic number ??? */
-
-	if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &relation, &domlist, &compact) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	DBPLUS_FETCH_RESOURCE(r, relation);
-
-	if((*domlist)->type == IS_ARRAY) {
-		convert_to_array_ex(domlist);
-		for(zend_hash_internal_pointer_reset(_HASH(domlist));
-				SUCCESS==zend_hash_get_current_data(_HASH(domlist), (void **)&zdata);
-				zend_hash_move_forward(_HASH(domlist))) {
-			if((*zdata)->type==IS_STRING)
-				keys[nkeys++] = _STRING(zdata);
-			else {
-				php_error(E_WARNING, "Domlist array contains non-string value(s)");
-				Acc_error = ERR_USER;
-				RETURN_FALSE;
-			}
-		}
-	} else {
-		convert_to_string_ex(domlist);
-		name = estrdup(_STRING(domlist));
-		while (p = strtok(nkeys ? 0 : name, " 	"))
-			keys[nkeys++] = p;
-	}
-
-	convert_to_long_ex(compact);
-	
-	rnew = cdbRsecindex(r, nkeys, keys, _INT(compact));
-	if(name) efree(name);
-
-	if(rnew) {
-		/* TODO realy delete old relation resource ? */
-		zend_list_delete((*relation)->value.lval);	
-		
-		ZEND_REGISTER_RESOURCE(return_value, rnew, le_dbplus_relation);
-	} else {
-		/* TODO error reporting */
-		RETURN_FALSE;
-	}
+  relf *r, *rnew;
+  zval **relation, **domlist, **compact, **zdata;
+  int nkeys=0;
+  char *p, *name=NULL, *keys[40]; /* TODO hardcoded magic number ??? */
+
+  if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &relation, &domlist, &compact) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
+
+  DBPLUS_FETCH_RESOURCE(r, relation);
+
+  if((*domlist)->type == IS_ARRAY) {
+    convert_to_array_ex(domlist);
+    for(zend_hash_internal_pointer_reset(_HASH(domlist));
+        SUCCESS==zend_hash_get_current_data(_HASH(domlist), (void **)&zdata);
+        zend_hash_move_forward(_HASH(domlist))) {
+      if((*zdata)->type==IS_STRING)
+        keys[nkeys++] = _STRING(zdata);
+      else {
+        php_error(E_WARNING, "Domlist array contains non-string value(s)");
+        Acc_error = ERR_USER;
+        RETURN_FALSE;
+      }
+    }
+  } else {
+    convert_to_string_ex(domlist);
+    name = estrdup(_STRING(domlist));
+    while (p = strtok(nkeys ? 0 : name, "   "))
+      keys[nkeys++] = p;
+  }
+
+  convert_to_long_ex(compact);
+  
+  rnew = cdbRsecindex(r, nkeys, keys, _INT(compact));
+  if(name) efree(name);
+
+  if(rnew) {
+    /* TODO realy delete old relation resource ? */
+    zend_list_delete((*relation)->value.lval);  
+    
+    ZEND_REGISTER_RESOURCE(return_value, rnew, le_dbplus_relation);
+  } else {
+    /* TODO error reporting */
+    RETURN_FALSE;
+  }
 }
 /* }}} */
 
@@ -1169,15 +1169,15 @@ PHP_FUNCTION(dbplus_rsecindex)
    Remove relation from filesystem */
 PHP_FUNCTION(dbplus_runlink)
 {
-	relf *r;
-	zval **relation;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  relf *r;
+  zval **relation;
+  if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	RETURN_LONG(cdbRunlink(&r));
+  RETURN_LONG(cdbRunlink(&r));
 }
 /* }}} */
 
@@ -1186,16 +1186,16 @@ PHP_FUNCTION(dbplus_runlink)
 PHP_FUNCTION(dbplus_rzap)
 {
 
-	/* todo: optional argument */
-	relf *r;
-	zval **relation, **truncate;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  /* todo: optional argument */
+  relf *r;
+  zval **relation, **truncate;
+  if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
  
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	RETURN_LONG(cdbRzap(r, 1));
+  RETURN_LONG(cdbRzap(r, 1));
 }
 /* }}} */
 
@@ -1203,13 +1203,13 @@ PHP_FUNCTION(dbplus_rzap)
    ??? */
 PHP_FUNCTION(dbplus_savepos)
 {
-	relf *r;
-	zval **relation;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  relf *r;
+  zval **relation;
+  if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
   RETURN_LONG(cdb_savepos(r));
 }
@@ -1219,17 +1219,17 @@ PHP_FUNCTION(dbplus_savepos)
    ???? */
 PHP_FUNCTION(dbplus_setindex)
 {
-	relf *r;
-	zval **relation, **idx_name;
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &idx_name) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  relf *r;
+  zval **relation, **idx_name;
+  if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &idx_name) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	convert_to_string_ex(idx_name);
-	
-	RETURN_LONG(cdb_setindex(r, _STRING(idx_name)));
+  convert_to_string_ex(idx_name);
+  
+  RETURN_LONG(cdb_setindex(r, _STRING(idx_name)));
 }
 /* }}} */
 
@@ -1237,17 +1237,17 @@ PHP_FUNCTION(dbplus_setindex)
    ??? */
 PHP_FUNCTION(dbplus_setindexbynumber)
 {
-	relf *r;
-	zval **relation, **idx_number;
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &idx_number) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  relf *r;
+  zval **relation, **idx_number;
+  if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &relation, &idx_number) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	convert_to_long_ex(idx_number);
-	
-	RETURN_LONG(cdb_setindexbynumber(r, (*idx_number)->value.lval));
+  convert_to_long_ex(idx_number);
+  
+  RETURN_LONG(cdb_setindexbynumber(r, (*idx_number)->value.lval));
 }
 /* }}} */
 
@@ -1255,39 +1255,39 @@ PHP_FUNCTION(dbplus_setindexbynumber)
    Perform SQL query */
 PHP_FUNCTION(dbplus_sql)
 {
-	int argc;
-	zval **query, **server, **dbpath;
-	relf *r;
-
-	argc = ZEND_NUM_ARGS();
-	if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &query, &server, &dbpath) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-	
-	switch (argc) {
-	case 3:
-		convert_to_string_ex(dbpath);
-		php_error(E_WARNING, "Arg dbpath: %s", _STRING(dbpath));
-		/* Fall-through. */
-	case 2:
-		convert_to_string_ex(server);
-		php_error(E_WARNING, "Arg server: %s", _STRING(server));
-		/* Fall-through. */
-	case 1:
-		convert_to_string_ex(query);
-		php_error(E_WARNING, "Arg query: %s", _STRING(query));
-		break;
-	}
-	
-	r = cdb_sql((argc>=2)?_STRING(server):"localhost",
-								 _STRING(query),
-								 (argc==3)?_STRING(dbpath):NULL);
-	if(r == NULL) {
-		/* TODO error handling */
-		RETURN_FALSE;
-	}
-	
-	ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);	
+  int argc;
+  zval **query, **server, **dbpath;
+  relf *r;
+
+  argc = ZEND_NUM_ARGS();
+  if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &query, &server, &dbpath) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
+  
+  switch (argc) {
+  case 3:
+    convert_to_string_ex(dbpath);
+    php_error(E_WARNING, "Arg dbpath: %s", _STRING(dbpath));
+    /* Fall-through. */
+  case 2:
+    convert_to_string_ex(server);
+    php_error(E_WARNING, "Arg server: %s", _STRING(server));
+    /* Fall-through. */
+  case 1:
+    convert_to_string_ex(query);
+    php_error(E_WARNING, "Arg query: %s", _STRING(query));
+    break;
+  }
+  
+  r = cdb_sql((argc>=2)?_STRING(server):"localhost",
+                 _STRING(query),
+                 (argc==3)?_STRING(dbpath):NULL);
+  if(r == NULL) {
+    /* TODO error handling */
+    RETURN_FALSE;
+  }
+  
+  ZEND_REGISTER_RESOURCE(return_value, r, le_dbplus_relation);  
 }
 /* }}} */
 
@@ -1295,24 +1295,24 @@ PHP_FUNCTION(dbplus_sql)
     */
 PHP_FUNCTION(dbplus_tcl)
 {
-	zval **sid, **script;
-	char *ret;
-	int result_type;
+  zval **sid, **script;
+  char *ret;
+  int result_type;
 
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &sid, &script) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &sid, &script) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	convert_to_long_ex(sid);
-	convert_to_string_ex(script);
+  convert_to_long_ex(sid);
+  convert_to_string_ex(script);
 
-	cdb_tcl(_INT(sid),_STRING(script),&ret,&result_type);
+  cdb_tcl(_INT(sid),_STRING(script),&ret,&result_type);
 
-	if(ret) {
-		RETURN_STRING(ret,1);
-	} else {
-		RETURN_FALSE;
-	}
+  if(ret) {
+    RETURN_STRING(ret,1);
+  } else {
+    RETURN_FALSE;
+  }
 }
 /* }}} */
 
@@ -1320,30 +1320,30 @@ PHP_FUNCTION(dbplus_tcl)
    Remove tuple and return new current tuple */
 PHP_FUNCTION(dbplus_tremove)
 {
-	zval **relation, **old, **current;
-	enum errorcond stat = ERR_UNKNOWN;
-	relf *r;
-	tuple told, tcurr;
-	int argc;
-	
-	argc = ZEND_NUM_ARGS(); 
- 	if ( argc<2 || argc>3 || zend_get_parameters_ex(2, &relation, &old, &current) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	DBPLUS_FETCH_RESOURCE(r, relation);
-
-	convert_to_array_ex(old);
-	
-	if(var2tuple(r, old, &told))
-		RETURN_LONG(ERR_UNKNOWN);
-
-	stat=cdbTremove(r, &told, &tcurr);
-	
-	if((stat==ERR_NOERR) && (argc==3))
-		tuple2var(r, &tcurr, current);
-
-	RETURN_LONG(stat);
+  zval **relation, **old, **current;
+  enum errorcond stat = ERR_UNKNOWN;
+  relf *r;
+  tuple told, tcurr;
+  int argc;
+  
+  argc = ZEND_NUM_ARGS(); 
+  if ( argc<2 || argc>3 || zend_get_parameters_ex(2, &relation, &old, &current) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
+
+  DBPLUS_FETCH_RESOURCE(r, relation);
+
+  convert_to_array_ex(old);
+  
+  if(var2tuple(r, old, &told))
+    RETURN_LONG(ERR_UNKNOWN);
+
+  stat=cdbTremove(r, &told, &tcurr);
+  
+  if((stat==ERR_NOERR) && (argc==3))
+    tuple2var(r, &tcurr, current);
+
+  RETURN_LONG(stat);
 }
 /* }}} */
 
@@ -1351,15 +1351,15 @@ PHP_FUNCTION(dbplus_tremove)
    ??? */
 PHP_FUNCTION(dbplus_undo)
 {
-	relf *r;
-	zval **relation;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  relf *r;
+  zval **relation;
+  if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	RETURN_LONG(cdb_undo(r));
+  RETURN_LONG(cdb_undo(r));
 }
 /* }}} */
 
@@ -1367,15 +1367,15 @@ PHP_FUNCTION(dbplus_undo)
    ??? */
 PHP_FUNCTION(dbplus_undoprepare)
 {
-	relf *r;
-	zval **relation;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  relf *r;
+  zval **relation;
+  if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	RETURN_LONG(cdb_undoprepare(r));
+  RETURN_LONG(cdb_undoprepare(r));
 }
 /* }}} */
 
@@ -1383,15 +1383,15 @@ PHP_FUNCTION(dbplus_undoprepare)
    Give up write lock on relation */
 PHP_FUNCTION(dbplus_unlockrel)
 {
-	relf *r;
-	zval **relation;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  relf *r;
+  zval **relation;
+  if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	RETURN_LONG(cdb_unlockrel(r));
+  RETURN_LONG(cdb_unlockrel(r));
 }
 /* }}} */
 
@@ -1399,15 +1399,15 @@ PHP_FUNCTION(dbplus_unlockrel)
    Remove constraint from relation */
 PHP_FUNCTION(dbplus_unselect)
 {
-	relf *r;
-	zval **relation;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  relf *r;
+  zval **relation;
+  if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	RETURN_LONG(cdb_unselect(r));
+  RETURN_LONG(cdb_unselect(r));
 }
 /* }}} */
 
@@ -1415,29 +1415,29 @@ PHP_FUNCTION(dbplus_unselect)
    Update specified tuple in relation */
 PHP_FUNCTION(dbplus_update)
 {
-	zval **relation, **old, **new;
-	enum errorcond stat = ERR_UNKNOWN;
-	relf *r;
-	tuple told, tnew;
+  zval **relation, **old, **new;
+  enum errorcond stat = ERR_UNKNOWN;
+  relf *r;
+  tuple told, tnew;
 
- 	if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &relation, &old, &new) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &relation, &old, &new) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	convert_to_array_ex(old);
-	convert_to_array_ex(new);
-	
-	if(var2tuple(r, old, &told))
-		RETURN_LONG(ERR_UNKNOWN);
+  convert_to_array_ex(old);
+  convert_to_array_ex(new);
+  
+  if(var2tuple(r, old, &told))
+    RETURN_LONG(ERR_UNKNOWN);
 
-	if(var2tuple(r, new, &tnew))
-		RETURN_LONG(ERR_UNKNOWN);
+  if(var2tuple(r, new, &tnew))
+    RETURN_LONG(ERR_UNKNOWN);
 
-	stat=cdb_update(r, &told, &tnew);
-	
-	RETURN_LONG(stat);
+  stat=cdb_update(r, &told, &tnew);
+  
+  RETURN_LONG(stat);
 }
 /* }}} */
 
@@ -1445,15 +1445,15 @@ PHP_FUNCTION(dbplus_update)
    Request exclusive lock on relation */
 PHP_FUNCTION(dbplus_xlockrel)
 {
-	relf *r;
-	zval **relation;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  relf *r;
+  zval **relation;
+  if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	RETURN_LONG(cdb_xlockrel(r));
+  RETURN_LONG(cdb_xlockrel(r));
 }
 /* }}} */
 
@@ -1461,15 +1461,15 @@ PHP_FUNCTION(dbplus_xlockrel)
    Free exclusive lock on relation */
 PHP_FUNCTION(dbplus_xunlockrel)
 {
-	relf *r;
-	zval **relation;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
+  relf *r;
+  zval **relation;
+  if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &relation) == FAILURE){
+    WRONG_PARAM_COUNT;
+  }
 
-	DBPLUS_FETCH_RESOURCE(r, relation);
+  DBPLUS_FETCH_RESOURCE(r, relation);
 
-	RETURN_LONG(cdb_xunlockrel(r));
+  RETURN_LONG(cdb_xunlockrel(r));
 }
 /* }}} */