GNOME.org
 

[msitools] Replace ERR with g_critical

commit 11f969a2572e0cb226f994f2d610bfb8856f8d11
Author: Marc-Andrà Lureau <marcandre lureau gmail com>
Date:   Wed Feb 6 14:01:11 2013 +0100

    Replace ERR with g_critical

 libmsi/debug.h               |    2 -
 libmsi/distinct.c            |    6 ++--
 libmsi/insert.c              |    2 +-
 libmsi/libmsi-database.c     |    8 +++---
 libmsi/libmsi-query.c        |    6 ++--
 libmsi/libmsi-record.c       |    6 ++--
 libmsi/libmsi-summary-info.c |   20 ++++++++--------
 libmsi/sql-parser.y          |    2 +-
 libmsi/string.c              |   18 +++++++-------
 libmsi/table.c               |   50 +++++++++++++++++++++---------------------
 libmsi/where.c               |   16 ++++++------
 11 files changed, 67 insertions(+), 69 deletions(-)
---
diff --git a/libmsi/debug.h b/libmsi/debug.h
index a4393c1..7b6c903 100644
--- a/libmsi/debug.h
+++ b/libmsi/debug.h
@@ -116,8 +116,6 @@ static inline const char *debugstr_a( const char *s )  { return wine_dbgstr_an(
 #define WARN_ON(channel)    0
 #define FIXME(fmt, ...)     (void)0 // WINE_DPRINTF(FIXME, __func__, fmt, ## __VA_ARGS__)
 #define FIXME_ON(channel)   0
-#define ERR(fmt, ...)       (void)0 // WINE_DPRINTF(ERR, __func__, fmt, ## __VA_ARGS__)
-#define ERR_ON(channel)     0
 
 
 #ifdef __cplusplus
diff --git a/libmsi/distinct.c b/libmsi/distinct.c
index f47a289..2d9aab9 100644
--- a/libmsi/distinct.c
+++ b/libmsi/distinct.c
@@ -133,14 +133,14 @@ static unsigned distinct_view_execute( LibmsiView *view, LibmsiRecord *record )
             r = dv->table->ops->fetch_int( dv->table, i, j, &val );
             if( r != LIBMSI_RESULT_SUCCESS )
             {
-                ERR("Failed to fetch int at %d %d\n", i, j );
+                g_critical("Failed to fetch int at %d %d\n", i, j );
                 distinct_free( rowset );
                 return r;
             }
             x = distinct_insert( x, val, i );
             if( !*x )
             {
-                ERR("Failed to insert at %d %d\n", i, j );
+                g_critical("Failed to insert at %d %d\n", i, j );
                 distinct_free( rowset );
                 return LIBMSI_RESULT_FUNCTION_FAILED;
             }
@@ -279,7 +279,7 @@ unsigned distinct_view_create( LibmsiDatabase *db, LibmsiView **view, LibmsiView
     r = table->ops->get_dimensions( table, NULL, &count );
     if( r != LIBMSI_RESULT_SUCCESS )
     {
-        ERR("can't get table dimensions\n");
+        g_critical("can't get table dimensions\n");
         return r;
     }
 
diff --git a/libmsi/insert.c b/libmsi/insert.c
index 1301584..3a3d81b 100644
--- a/libmsi/insert.c
+++ b/libmsi/insert.c
@@ -84,7 +84,7 @@ LibmsiRecord *msi_query_merge_record( unsigned fields, const column_info *vl, Li
             wildcard_count++;
             break;
         default:
-            ERR("Unknown expression type %d\n", vl->val->type);
+            g_critical("Unknown expression type %d\n", vl->val->type);
         }
         vl = vl->next;
     }
diff --git a/libmsi/libmsi-database.c b/libmsi/libmsi-database.c
index b088ced..643314e 100644
--- a/libmsi/libmsi-database.c
+++ b/libmsi/libmsi-database.c
@@ -851,7 +851,7 @@ static char *msi_build_createsql_columns(char **columns_data, char **types, unsi
                 type = type_object;
                 break;
             default:
-                ERR("Unknown type: %c\n", types[i][0]);
+                g_critical("Unknown type: %c\n", types[i][0]);
                 msi_free(columns);
                 return NULL;
         }
@@ -991,7 +991,7 @@ static unsigned construct_record(unsigned num_columns, char **types,
                 }
                 break;
             default:
-                ERR("Unhandled column type: %c\n", types[i][0]);
+                g_critical("Unhandled column type: %c\n", types[i][0]);
                 g_object_unref(*rec);
                 return LIBMSI_RESULT_FUNCTION_FAILED;
         }
@@ -2208,14 +2208,14 @@ LibmsiResult _libmsi_database_open(LibmsiDatabase *db)
          memcmp( uuid, clsid_msi_patch, 16 ) != 0 &&
          memcmp( uuid, clsid_msi_transform, 16 ) != 0 )
     {
-        ERR("storage GUID is not a MSI database GUID %s\n",
+        g_critical("storage GUID is not a MSI database GUID %s\n",
              debugstr_guid(uuid) );
         goto end;
     }
 
     if ( db->flags & LIBMSI_DB_FLAGS_PATCH && memcmp( uuid, clsid_msi_patch, 16 ) != 0 )
     {
-        ERR("storage GUID is not the MSI patch GUID %s\n",
+        g_critical("storage GUID is not the MSI patch GUID %s\n",
              debugstr_guid(uuid) );
         goto end;
     }
diff --git a/libmsi/libmsi-query.c b/libmsi/libmsi-query.c
index c61c23c..e34967b 100644
--- a/libmsi/libmsi-query.c
+++ b/libmsi/libmsi-query.c
@@ -326,7 +326,7 @@ unsigned msi_view_get_row(LibmsiDatabase *db, LibmsiView *view, unsigned row, Li
         ret = view->ops->get_column_info(view, i, NULL, &type, NULL, NULL);
         if (ret)
         {
-            ERR("Error getting column type for %d\n", i);
+            g_critical("Error getting column type for %d\n", i);
             continue;
         }
 
@@ -349,12 +349,12 @@ unsigned msi_view_get_row(LibmsiDatabase *db, LibmsiView *view, unsigned row, Li
         ret = view->ops->fetch_int(view, row, i, &ival);
         if (ret)
         {
-            ERR("Error fetching data for %d\n", i);
+            g_critical("Error fetching data for %d\n", i);
             continue;
         }
 
         if (! (type & MSITYPE_VALID))
-            ERR("Invalid type!\n");
+            g_critical("Invalid type!\n");
 
         /* check if it's nul (0) - if so, don't set anything */
         if (!ival)
diff --git a/libmsi/libmsi-record.c b/libmsi/libmsi-record.c
index 645d7eb..8dbd555 100644
--- a/libmsi/libmsi-record.c
+++ b/libmsi/libmsi-record.c
@@ -64,7 +64,7 @@ _libmsi_free_field (LibmsiField *field )
         }
         break;
     default:
-        ERR ("Invalid field type %d\n", field->type);
+        g_critical ("Invalid field type %d\n", field->type);
     }
 }
 
@@ -213,7 +213,7 @@ unsigned _libmsi_record_copy_field( LibmsiRecord *in_rec, unsigned in_n,
             out->u.stream = in->u.stream;
             break;
         default:
-            ERR("invalid field type %d\n", in->type);
+            g_critical("invalid field type %d\n", in->type);
         }
         if (r == LIBMSI_RESULT_SUCCESS)
             out->type = in->type;
@@ -807,7 +807,7 @@ char *msi_dup_record_field( LibmsiRecord *rec, int field )
     r = _libmsi_record_get_string( rec, field, str, &sz );
     if (r != LIBMSI_RESULT_SUCCESS)
     {
-        ERR("failed to get string!\n");
+        g_critical("failed to get string!\n");
         msi_free( str );
         return NULL;
     }
diff --git a/libmsi/libmsi-summary-info.c b/libmsi/libmsi-summary-info.c
index ee9d32d..7782d36 100644
--- a/libmsi/libmsi-summary-info.c
+++ b/libmsi/libmsi-summary-info.c
@@ -321,14 +321,14 @@ static void read_properties_from_data( LibmsiOLEVariant *prop, const uint8_t *da
 
         if( propid >= MSI_MAX_PROPS )
         {
-            ERR("Unknown property ID %d\n", propid );
+            g_critical("Unknown property ID %d\n", propid );
             break;
         }
 
         type = get_type( propid );
         if( type == OLEVT_EMPTY )
         {
-            ERR("propid %d has unknown type\n", propid);
+            g_critical("propid %d has unknown type\n", propid);
             break;
         }
 
@@ -336,14 +336,14 @@ static void read_properties_from_data( LibmsiOLEVariant *prop, const uint8_t *da
 
         if( dwOffset + 4 > sz )
         {
-            ERR("not enough data for type %d %d \n", dwOffset, sz);
+            g_critical("not enough data for type %d %d \n", dwOffset, sz);
             break;
         }
 
         proptype = read_dword(data, &dwOffset);
         if( dwOffset + 4 > sz )
         {
-            ERR("not enough data for type %d %d \n", dwOffset, sz);
+            g_critical("not enough data for type %d %d \n", dwOffset, sz);
             break;
         }
 
@@ -357,7 +357,7 @@ static void read_properties_from_data( LibmsiOLEVariant *prop, const uint8_t *da
         case OLEVT_FILETIME:
             if( dwOffset + 8 > sz )
             {
-                ERR("not enough data for type %d %d \n", dwOffset, sz);
+                g_critical("not enough data for type %d %d \n", dwOffset, sz);
                 break;
             }
             property->filetime = read_dword(data, &dwOffset);
@@ -367,7 +367,7 @@ static void read_properties_from_data( LibmsiOLEVariant *prop, const uint8_t *da
             len = read_dword(data, &dwOffset);
             if( dwOffset + len > sz )
             {
-                ERR("not enough data for type %d %d %d \n", dwOffset, len, sz);
+                g_critical("not enough data for type %d %d %d \n", dwOffset, len, sz);
                 break;
             }
             str = msi_alloc( len );
@@ -391,7 +391,7 @@ static void read_properties_from_data( LibmsiOLEVariant *prop, const uint8_t *da
         }
         else
         {
-            ERR("invalid type \n");
+            g_critical("invalid type \n");
             break;
         }
     }
@@ -421,7 +421,7 @@ static unsigned load_summary_info( LibmsiSummaryInfo *si, GsfInput *stm )
     ofs = 0;
     if( read_word( data, &ofs) != 0xfffe )
     {
-        ERR("property set not little-endian\n");
+        g_critical("property set not little-endian\n");
         goto done;
     }
 
@@ -442,7 +442,7 @@ static unsigned load_summary_info( LibmsiSummaryInfo *si, GsfInput *stm )
 
     if( cProperties > MSI_MAX_PROPS )
     {
-        ERR("too many properties %d\n", cProperties);
+        g_critical("too many properties %d\n", cProperties);
         goto done;
     }
 
@@ -990,7 +990,7 @@ unsigned msi_add_suminfo( LibmsiDatabase *db, char ***records, int num_records,
     si = libmsi_summary_info_new (db, num_records * (num_columns / 2), NULL);
     if (!si)
     {
-        ERR("no summary information!\n");
+        g_critical("no summary information!\n");
         return LIBMSI_RESULT_FUNCTION_FAILED;
     }
 
diff --git a/libmsi/sql-parser.y b/libmsi/sql-parser.y
index 4725fd8..853bec7 100644
--- a/libmsi/sql-parser.y
+++ b/libmsi/sql-parser.y
@@ -855,7 +855,7 @@ int sql_atoi( void *info )
     {
         if( '0' > p[i] || '9' < p[i] )
         {
-            ERR("should only be numbers here!\n");
+            g_critical("should only be numbers here!\n");
             break;
         }
         r = (p[i]-'0') + r*10;
diff --git a/libmsi/string.c b/libmsi/string.c
index 2f3d144..9fdd5ff 100644
--- a/libmsi/string.c
+++ b/libmsi/string.c
@@ -161,7 +161,7 @@ static int st_find_free_entry( string_table *st )
     st->maxcount = sz;
     if( st->strings[st->freeslot].persistent_refcount ||
         st->strings[st->freeslot].nonpersistent_refcount )
-        ERR("oops. expected freeslot to be free...\n");
+        g_critical("oops. expected freeslot to be free...\n");
     return st->freeslot;
 }
 
@@ -280,7 +280,7 @@ static int msi_addstring( string_table *st, unsigned n, const char *data, int le
 
     if( n < 1 )
     {
-        ERR("invalid index adding %s (%d)\n", debugstr_a( data ), n );
+        g_critical("invalid index adding %s (%d)\n", debugstr_a( data ), n );
         return -1;
     }
 
@@ -428,7 +428,7 @@ static void string_totalsize( const string_table *st, unsigned *datasize, unsign
     char *str;
 
     if( st->strings[0].str || st->strings[0].persistent_refcount || st->strings[0].nonpersistent_refcount)
-        ERR("oops. element 0 has a string\n");
+        g_critical("oops. element 0 has a string\n");
 
     codepage = st->codepage ? st->codepage : gsf_msole_iconv_win_codepage();
 
@@ -531,18 +531,18 @@ string_table *msi_load_string_table( GsfInfile *stg, unsigned *bytes_per_strref
 
         if ( (offset + len) > datasize )
         {
-            ERR("string table corrupt?\n");
+            g_critical("string table corrupt?\n");
             break;
         }
 
         r = msi_addstring( st, n, data+offset, len, refs, StringPersistent );
         if( r != n )
-            ERR("Failed to add string %d\n", n );
+            g_critical("Failed to add string %d\n", n );
         offset += len;
     }
 
     if ( datasize != offset )
-        ERR("string table load failed! (%08x != %08x), please report\n", datasize, offset );
+        g_critical("string table load failed! (%08x != %08x), please report\n", datasize, offset );
 
     TRACE("Loaded %d strings\n", count);
 
@@ -611,7 +611,7 @@ unsigned msi_save_string_table( const string_table *st, LibmsiDatabase *db, unsi
         r = _libmsi_string_id( st, n, data+used, &sz );
         if( r != LIBMSI_RESULT_SUCCESS )
         {
-            ERR("failed to fetch string\n");
+            g_critical("failed to fetch string\n");
             sz = 0;
         }
 
@@ -642,14 +642,14 @@ unsigned msi_save_string_table( const string_table *st, LibmsiDatabase *db, unsi
         used += sz;
         if( used > datasize  )
         {
-            ERR("oops overran %d >= %d\n", used, datasize);
+            g_critical("oops overran %d >= %d\n", used, datasize);
             goto err;
         }
     }
 
     if( used != datasize )
     {
-        ERR("oops used %d != datasize %d\n", used, datasize);
+        g_critical("oops used %d != datasize %d\n", used, datasize);
         goto err;
     }
 
diff --git a/libmsi/table.c b/libmsi/table.c
index b01943c..ef84bf7 100644
--- a/libmsi/table.c
+++ b/libmsi/table.c
@@ -96,7 +96,7 @@ static inline unsigned bytes_per_column( LibmsiDatabase *db, const LibmsiColumnI
         return 2;
 
     if( (col->type & 0xff) != 4 )
-        ERR("Invalid column size!\n");
+        g_critical("Invalid column size!\n");
 
     return 4;
 }
@@ -170,7 +170,7 @@ char *encode_streamname(bool bTable, const char *in)
             *p++ = ch;
         }
     }
-    ERR("Failed to encode stream name (%s)\n",debugstr_a(in));
+    g_critical("Failed to encode stream name (%s)\n",debugstr_a(in));
     msi_free( out );
     return NULL;
 }
@@ -426,7 +426,7 @@ static unsigned read_table_from_storage( LibmsiDatabase *db, LibmsiTable *t, Gsf
 
             if ( n != 2 && n != 3 && n != 4 )
             {
-                ERR("oops - unknown column width %d\n", n);
+                g_critical("oops - unknown column width %d\n", n);
                 goto err;
             }
             if (t->colinfo[j].type & MSITYPE_STRING && n < m)
@@ -651,7 +651,7 @@ static unsigned get_tablecolumns( LibmsiDatabase *db, const char *szTableName, L
     r = get_table( db, szColumns, &table );
     if (r != LIBMSI_RESULT_SUCCESS)
     {
-        ERR("couldn't load _Columns table\n");
+        g_critical("couldn't load _Columns table\n");
         return LIBMSI_RESULT_FUNCTION_FAILED;
     }
 
@@ -680,13 +680,13 @@ static unsigned get_tablecolumns( LibmsiDatabase *db, const char *szTableName, L
             /* check the column number is in range */
             if (col < 1 || col > maxcount)
             {
-                ERR("column %d out of range\n", col);
+                g_critical("column %d out of range\n", col);
                 continue;
             }
             /* check if this column was already set */
             if (colinfo[col - 1].number)
             {
-                ERR("duplicate column %d\n", col);
+                g_critical("duplicate column %d\n", col);
                 continue;
             }
             colinfo[col - 1].tablename = msi_string_lookup_id( db->strings, table_id );
@@ -704,7 +704,7 @@ static unsigned get_tablecolumns( LibmsiDatabase *db, const char *szTableName, L
 
     if (colinfo && n != maxcount)
     {
-        ERR("missing column in table %s\n", debugstr_a(szTableName));
+        g_critical("missing column in table %s\n", debugstr_a(szTableName));
         msi_free_colinfo( colinfo, maxcount );
         return LIBMSI_RESULT_FUNCTION_FAILED;
     }
@@ -910,7 +910,7 @@ static unsigned save_table( LibmsiDatabase *db, const LibmsiTable *t, unsigned b
 
             if (n != 2 && n != 3 && n != 4)
             {
-                ERR("oops - unknown column width %d\n", n);
+                g_critical("oops - unknown column width %d\n", n);
                 goto err;
             }
             if (t->colinfo[j].type & MSITYPE_STRING && n < m)
@@ -918,7 +918,7 @@ static unsigned save_table( LibmsiDatabase *db, const LibmsiTable *t, unsigned b
                 unsigned id = read_table_int( t->data, i, ofs_mem, LONG_STR_BYTES );
                 if (id > 1 << bytes_per_strref * 8)
                 {
-                    ERR("string id %u out of range\n", id);
+                    g_critical("string id %u out of range\n", id);
                     goto err;
                 }
             }
@@ -986,7 +986,7 @@ bool table_view_exists( LibmsiDatabase *db, const char *name )
     r = get_table( db, szTables, &table );
     if( r != LIBMSI_RESULT_SUCCESS )
     {
-        ERR("table %s not available\n", debugstr_a(szTables));
+        g_critical("table %s not available\n", debugstr_a(szTables));
         return false;
     }
 
@@ -1029,15 +1029,15 @@ static unsigned table_view_fetch_int( LibmsiView *view, unsigned row, unsigned c
 
     if( tv->columns[col-1].offset >= tv->row_size )
     {
-        ERR("Stuffed up %d >= %d\n", tv->columns[col-1].offset, tv->row_size );
-        ERR("%p %p\n", tv, tv->columns );
+        g_critical("Stuffed up %d >= %d\n", tv->columns[col-1].offset, tv->row_size );
+        g_critical("%p %p\n", tv, tv->columns );
         return LIBMSI_RESULT_FUNCTION_FAILED;
     }
 
     n = bytes_per_column( tv->db, &tv->columns[col - 1], LONG_STR_BYTES );
     if (n != 2 && n != 3 && n != 4)
     {
-        ERR("oops! what is %d bytes per column?\n", n );
+        g_critical("oops! what is %d bytes per column?\n", n );
         return LIBMSI_RESULT_FUNCTION_FAILED;
     }
 
@@ -1104,7 +1104,7 @@ static unsigned msi_stream_name( const LibmsiTableView *tv, unsigned row, char *
                     sprintf( number, fmt, ival^0x80000000 );
                     break;
                 default:
-                    ERR( "oops - unknown column width %d\n", n );
+                    g_critical( "oops - unknown column width %d\n", n );
                     r = LIBMSI_RESULT_FUNCTION_FAILED;
                     goto err;
                 }
@@ -1154,14 +1154,14 @@ static unsigned table_view_fetch_stream( LibmsiView *view, unsigned row, unsigne
     r = msi_stream_name( tv, row, &full_name );
     if ( r != LIBMSI_RESULT_SUCCESS )
     {
-        ERR("fetching stream, error = %d\n", r);
+        g_critical("fetching stream, error = %d\n", r);
         return r;
     }
 
     encname = encode_streamname( false, full_name );
     r = msi_get_raw_stream( tv->db, encname, stm );
     if( r )
-        ERR("fetching stream %s, error = %d\n",debugstr_a(full_name), r);
+        g_critical("fetching stream %s, error = %d\n",debugstr_a(full_name), r);
 
     if (*stm)
         g_object_set_data_full (G_OBJECT (*stm), "stname", full_name, g_free);
@@ -1186,8 +1186,8 @@ static unsigned table_view_set_int( LibmsiTableView *tv, unsigned row, unsigned
 
     if( tv->columns[col-1].offset >= tv->row_size )
     {
-        ERR("Stuffed up %d >= %d\n", tv->columns[col-1].offset, tv->row_size );
-        ERR("%p %p\n", tv, tv->columns );
+        g_critical("Stuffed up %d >= %d\n", tv->columns[col-1].offset, tv->row_size );
+        g_critical("%p %p\n", tv, tv->columns );
         return LIBMSI_RESULT_FUNCTION_FAILED;
     }
 
@@ -1197,7 +1197,7 @@ static unsigned table_view_set_int( LibmsiTableView *tv, unsigned row, unsigned
     n = bytes_per_column( tv->db, &tv->columns[col - 1], LONG_STR_BYTES );
     if ( n != 2 && n != 3 && n != 4 )
     {
-        ERR("oops! what is %d bytes per column?\n", n );
+        g_critical("oops! what is %d bytes per column?\n", n );
         return LIBMSI_RESULT_FUNCTION_FAILED;
     }
 
@@ -1285,7 +1285,7 @@ static unsigned get_table_value_from_record( LibmsiTableView *tv, LibmsiRecord *
         *pvalue = 0x8000 + libmsi_record_get_int( rec, iField );
         if ( *pvalue & 0xffff0000 )
         {
-            ERR("field %u value %d out of range\n", iField, *pvalue - 0x8000);
+            g_critical("field %u value %d out of range\n", iField, *pvalue - 0x8000);
             return LIBMSI_RESULT_FUNCTION_FAILED;
         }
     }
@@ -1724,8 +1724,8 @@ static unsigned table_view_find_matching_rows( LibmsiView *view, unsigned col,
 
         if( tv->columns[col-1].offset >= tv->row_size )
         {
-            ERR("Stuffed up %d >= %d\n", tv->columns[col-1].offset, tv->row_size );
-            ERR("%p %p\n", tv, tv->columns );
+            g_critical("Stuffed up %d >= %d\n", tv->columns[col-1].offset, tv->row_size );
+            g_critical("%p %p\n", tv, tv->columns );
             return LIBMSI_RESULT_FUNCTION_FAILED;
         }
 
@@ -2215,7 +2215,7 @@ static LibmsiRecord *msi_get_transform_record( const LibmsiTableView *tv, const
                 TRACE(" field %d [0x%08x]\n", i+1, val );
                 break;
             default:
-                ERR("oops - unknown column width %d\n", n);
+                g_critical("oops - unknown column width %d\n", n);
                 break;
             }
             ofs += n;
@@ -2314,7 +2314,7 @@ static unsigned msi_row_matches( LibmsiTableView *tv, unsigned row, const unsign
         r = table_view_fetch_int( &tv->view, row, i+1, &x );
         if ( r != LIBMSI_RESULT_SUCCESS )
         {
-            ERR("table_view_fetch_int shouldn't fail here\n");
+            g_critical("table_view_fetch_int shouldn't fail here\n");
             break;
         }
 
@@ -2444,7 +2444,7 @@ static unsigned msi_table_load_transform( LibmsiDatabase *db, GsfInfile *stg,
         /* check we didn't run of the end of the table */
         if (n + sz > rawsize)
         {
-            ERR("borked.\n");
+            g_critical("borked.\n");
             dump_table( st, (uint16_t *)rawdata, rawsize );
             break;
         }
diff --git a/libmsi/where.c b/libmsi/where.c
index f0403bf..9938f35 100644
--- a/libmsi/where.c
+++ b/libmsi/where.c
@@ -428,7 +428,7 @@ static int expr_eval_binary( LibmsiWhereView *wv, const unsigned rows[],
         *val = ( lval != rval );
         break;
     default:
-        ERR("Unknown operator %d\n", expr->op );
+        g_critical("Unknown operator %d\n", expr->op );
         return LIBMSI_RESULT_FUNCTION_FAILED;
     }
 
@@ -468,7 +468,7 @@ static unsigned expr_eval_unary( LibmsiWhereView *wv, const unsigned rows[],
         *val = lval;
         break;
     default:
-        ERR("Unknown operator %d\n", expr->op );
+        g_critical("Unknown operator %d\n", expr->op );
         return LIBMSI_RESULT_FUNCTION_FAILED;
     }
     return LIBMSI_RESULT_SUCCESS;
@@ -500,7 +500,7 @@ static unsigned expr_eval_string( LibmsiWhereView *wv, const unsigned rows[],
         break;
 
     default:
-        ERR("Invalid expression type\n");
+        g_critical("Invalid expression type\n");
         r = LIBMSI_RESULT_FUNCTION_FAILED;
         *str = NULL;
         break;
@@ -584,7 +584,7 @@ static unsigned where_view_evaluate( LibmsiWhereView *wv, const unsigned rows[],
         return LIBMSI_RESULT_SUCCESS;
 
     default:
-        ERR("Invalid expression type\n");
+        g_critical("Invalid expression type\n");
         break;
     }
 
@@ -724,7 +724,7 @@ static unsigned reorder_check( const struct expr *expr, JOINTABLE **ordered_tabl
                 add_to_array(ordered_tables, *lastused);
             return res;
         default:
-            ERR("Unknown expr type: %i\n", expr->type);
+            g_critical("Unknown expr type: %i\n", expr->type);
             assert(0);
             return 0x1000000;
     }
@@ -780,7 +780,7 @@ static unsigned where_view_execute( LibmsiView *view, LibmsiRecord *record )
         r = table->view->ops->get_dimensions(table->view, &table->row_count, NULL);
         if (r != LIBMSI_RESULT_SUCCESS)
         {
-            ERR("failed to get table dimensions\n");
+            g_critical("failed to get table dimensions\n");
             return r;
         }
 
@@ -1082,7 +1082,7 @@ static unsigned where_view_verify_condition( LibmsiWhereView *wv, struct expr *c
         *valid = 1;
         break;
     default:
-        ERR("Invalid expression type\n");
+        g_critical("Invalid expression type\n");
         *valid = 0;
         break;
     }
@@ -1135,7 +1135,7 @@ unsigned where_view_create( LibmsiDatabase *db, LibmsiView **view, char *tables,
                                              &table->col_count);
         if (r != LIBMSI_RESULT_SUCCESS)
         {
-            ERR("can't get table dimensions\n");
+            g_critical("can't get table dimensions\n");
             goto end;
         }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]