The R Project SVN – R-packages – Diff – /trunk/SQLiteDF/src/utils.c

         g_sql_buf[i] = Realloc(g_sql_buf[i], g_sql_buf_sz[i], char);
     } else ret = 0;
     return ret;
+}
-int _expand_buf(int i, int size) {
+R_INLINE void  _expand_buf(int i, int size) {
-    int expanded = FALSE;
     if (size >= g_sql_buf_sz[i]) {
         g_sql_buf_sz[i] *= 2;
         g_sql_buf[i] = Realloc(g_sql_buf[i], g_sql_buf_sz[i], char);
-        expanded = TRUE;
+        /* return TRUE; */
+    }
-    return expanded;
+    /* return expanded; */
+}
 int _sqlite_error_check(int res, const char *file, int line) {
     int ret = FALSE;
     if (res != SQLITE_OK) {
     res = sqlite3_prepare(g_workspace, g_sql_buf[2], -1, &stmt, 0);
     sqlite3_finalize(stmt);
     if (_sqlite_error(res)) return R_NilValue;
-    PROTECT(ret = NEW_LIST(2));
-    /* set list names */
-    PROTECT(value = NEW_CHARACTER(2)); nprotected++;
-    SET_STRING_ELT(value, 0, mkChar("iname"));
-    SET_STRING_ELT(value, 1, mkChar("varname"));
-    SET_NAMES(ret, value);
-    /* set list values */
-    SET_VECTOR_ELT(ret, 0, mkString(sdf_iname));
-    SET_VECTOR_ELT(ret, 1, mkString("row name"));
-    /* set class */
-    SET_CLASS(ret, mkString("sqlite.vector"));
-    SET_SDFVECTORTYPE(ret, mkString("character"));
+    return _create_svector_sexp(sdf_iname, "sdf_data", "row name", "character");
-    UNPROTECT(nprotected);
-    return ret;
+}
 SEXP _create_sdf_sexp(const char *iname) {
     SEXP names, class, variable, ret;
     int nprotected = 0;

The R Project SVN R-packages