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

     return ret;
+}
 SEXP sdf_get_length(SEXP sdf) {
     char *iname;
+    int len;
+    sqlite3_stmt *stmt;
+    int res;
     iname  = CHAR(STRING_ELT(_getListElement(sdf, "iname"),0));
+    sprintf(g_sql_buf[0], "select * from [%s].sdf_data;", iname);
     if (!USE_SDF1(iname, TRUE, FALSE)) return R_NilValue;
-    int len = sprintf(g_sql_buf[0], "select * from [%s].sdf_data;", iname);
-    sqlite3_stmt *stmt;
-    int res;
-    res = sqlite3_prepare(g_workspace, g_sql_buf[0], len, &stmt, NULL);
+    res = sqlite3_prepare(g_workspace, g_sql_buf[0], -1, &stmt, NULL);
     if (_sqlite_error(res)) return R_NilValue;
-    SEXP ret;
     len = sqlite3_column_count(stmt)-1;
-    PROTECT(ret = NEW_INTEGER(1));
-    INTEGER(ret)[0] = len;
     sqlite3_finalize(stmt);
-    UNPROTECT(1);
-    return ret;
+    return ScalarInteger(len);
+}
 /* get row count */
 SEXP sdf_get_row_count(SEXP sdf) {
     char *iname = CHAR(STRING_ELT(_getListElement(sdf, "iname"),0));
     SEXP ret;
     nrow = _get_row_count2(iname, TRUE);
     if (nrow < 1) ret = R_NilValue;
-    else {
-        PROTECT(ret = NEW_INTEGER(1));
-        INTEGER(ret)[0] = nrow;
+    else ret = ScalarInteger(nrow);
-        UNPROTECT(1);
-    }
     return ret;
+}

The R Project SVN R-packages