[GRASS-SVN] r33693 - grass/branches/develbranch_6/lib/gis

[svn_grass at osgeo.org]

Author: neteler
Date: 2008-10-06 05:51:20 -0400 (Mon, 06 Oct 2008)
New Revision: 33693

Modified:
   grass/branches/develbranch_6/lib/gis/opencell.c
Log:
glynn: Ensure that fcb->gdal is either set or cleared, not left uninitialised (merge from trunk, r33690)

Modified: grass/branches/develbranch_6/lib/gis/opencell.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/opencell.c	2008-10-06 09:49:37 UTC (rev 33692)
+++ grass/branches/develbranch_6/lib/gis/opencell.c	2008-10-06 09:51:20 UTC (rev 33693)
@@ -306,9 +306,8 @@
     if ((fcb->reclass_flag = reclass_flag))
 	G_copy(&fcb->reclass, &reclass, sizeof(reclass));
 
-    if (gdal)
-	fcb->gdal = gdal;
-    else
+    fcb->gdal = gdal;
+    if (!gdal)
 	/* check for compressed data format, making initial reads if necessary */
 	if (G__check_format(fd) < 0) {
 	    close(fd);		/* warning issued by check_format() */