gnue/geas/src/oql oql.c

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/12/15 16:51:39

Modified files:
        geas/src/oql   : oql.c 

Log message:
        Removed some rubbish.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/oql/oql.c.diff?tr1=1.71&tr2=1.72&r1=text&r2=text

Patches:
Index: gnue/geas/src/oql/oql.c
diff -c gnue/geas/src/oql/oql.c:1.71 gnue/geas/src/oql/oql.c:1.72
*** gnue/geas/src/oql/oql.c:1.71        Sat Dec 15 15:09:54 2001
--- gnue/geas/src/oql/oql.c     Sat Dec 15 16:51:39 2001
***************
*** 19,25 ****
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
!   $Id: oql.c,v 1.71 2001/12/15 20:09:54 reinhard Exp $
  */
  
  #include "config.h"
--- 19,25 ----
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
!   $Id: oql.c,v 1.72 2001/12/15 21:51:39 reinhard Exp $
  */
  
  #include "config.h"
***************
*** 62,97 ****
  oql_query_as_sql (_QueryData * q, DBType database)
  {
    char *retval = NULL;
-   char *type = NULL, *dbtype = NULL;
    GString *buf = NULL;
  
-   switch (q->type)
-     {
-     case OQL_SELECT:
-       type = "SELECT";
-       break;
-     case OQL_WRITE:
-       type = "WRITE";
-       break;
-     case OQL_DELETE:
-       type = "DELETE";
-       break;
-     default:
-       type = "<unknown>";
-       break;
-     }
-   switch (database)
-     {
-     case OQL_DBTYPE_MYSQL:
-       dbtype = "MySQL";
-       break;
-     case OQL_DBTYPE_POSTGRESQL:
-       dbtype = "PostgreSQL";
-       break;
-     default:
-       dbtype = "<unknown>";
-     }
- 
    if (q->sql)
      {
        return (q->sql);
--- 62,69 ----
***************
*** 108,136 ****
      case OQL_WRITE:
        buf = oql_make_write (q, database);
        break;
      }
!   if (buf)
      {
!       if (database == OQL_DBTYPE_CACHEONLY)
!         {
!           retval = buf->str;
!           buf->str = NULL;
!           g_string_free (buf, TRUE);
!         }
!       else
!         {
!           q->sql = buf->str;
!           retval = q->sql;
!           buf->str = NULL;
!           g_string_free (buf, TRUE);
!         }
      }
! 
!   if (!retval)
      {
!       fatal_error ("error : no SQL was generated\n"
!                    "(serious error somewhere in the OQL module - hi, jamest, 
is this more helpful :)\n");
      }
    return (retval);
  }
  
--- 80,105 ----
      case OQL_WRITE:
        buf = oql_make_write (q, database);
        break;
+     default:
+       g_assert_not_reached ();
      }
! 
!   g_assert (buf);
! 
!   if (database == OQL_DBTYPE_CACHEONLY)
      {
!       retval = buf->str;
!       buf->str = NULL;
!       g_string_free (buf, TRUE);
      }
!   else
      {
!       q->sql = buf->str;
!       retval = q->sql;
!       buf->str = NULL;
!       g_string_free (buf, TRUE);
      }
+ 
    return (retval);
  }