scratch/sqlite afa1f04: Change "fields" into "columns"

[Lars Ingebrigtsen]

branch: scratch/sqlite
commit afa1f04178181d6553ae841e4438d647accbb7e0
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Change "fields" into "columns"
---
 src/lisp.h   |  2 +-
 src/sqlite.c | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/lisp.h b/src/lisp.h
index 9ba8c12..c669dbc 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2574,7 +2574,7 @@ xmint_pointer (Lisp_Object a)
 struct Lisp_Sqlite
 {
   union vectorlike_header header;
-  Lisp_Object fields;
+  Lisp_Object columns;
   void *db;
   void *stmt;
   void (*finalizer) (void *);
diff --git a/src/sqlite.c b/src/sqlite.c
index 53fadb8..855d611 100644
--- a/src/sqlite.c
+++ b/src/sqlite.c
@@ -41,16 +41,15 @@ sqlite_free (void *arg)
 }
 
 static Lisp_Object
-make_sqlite (bool is_statement, void *db, void *stmt, Lisp_Object fields)
+make_sqlite (bool is_statement, void *db, void *stmt, Lisp_Object columns)
 {
   struct Lisp_Sqlite *ptr
-    = ALLOCATE_ZEROED_PSEUDOVECTOR (struct Lisp_Sqlite, fields, PVEC_SQLITE);
-  ptr->fields = Qnil;
+    = ALLOCATE_ZEROED_PSEUDOVECTOR (struct Lisp_Sqlite, columns, PVEC_SQLITE);
   ptr->is_statement = is_statement;
   ptr->finalizer = sqlite_free;
   ptr->db = db;
   ptr->stmt = stmt;
-  ptr->fields = fields;
+  ptr->columns = columns;
   ptr->eof = false;
   return make_lisp_ptr (ptr, Lisp_Vectorlike);
 }
@@ -280,16 +279,16 @@ be queried with `sqlite-next' and other functions to get 
the data.  */)
     }
 
   /* Get the field names.  */
-  Lisp_Object fields = Qnil;
+  Lisp_Object columns = Qnil;
   int count = sqlite3_column_count (stmt);
   for (int i = 0; i < count; ++i)
-    fields = Fcons (build_string (sqlite3_column_name (stmt, i)), fields);
+    columns = Fcons (build_string (sqlite3_column_name (stmt, i)), columns);
 
-  fields = Fnreverse (fields);
+  columns = Fnreverse (columns);
 
   if (!NILP (cursor))
     {
-      retval = make_sqlite (true, db, stmt, fields);
+      retval = make_sqlite (true, db, stmt, columns);
       goto exit;
     }
 
@@ -298,7 +297,7 @@ be queried with `sqlite-next' and other functions to get 
the data.  */)
   while ((ret = sqlite3_step (stmt)) == SQLITE_ROW)
     data = Fcons (row_to_value (stmt), data);
 
-  retval = Fcons (fields, Fnreverse (data));
+  retval = Fcons (columns, Fnreverse (data));
   sqlite3_finalize (stmt);
 
  exit:
@@ -387,7 +386,7 @@ DEFUN ("sqlite-columns", Fsqlite_columns, Ssqlite_columns, 
1, 1, 0,
   if (!XSQLITE (set)->is_statement)
     xsignal1 (Qerror, build_string ("Invalid set object"));
 
-  return XSQLITE (set)->fields;
+  return XSQLITE (set)->columns;
 }
 
 DEFUN ("sqlite-more-p", Fsqlite_more_p, Ssqlite_more_p, 1, 1, 0,