From: Linas Vepstas <linasvepstas@gmail.com>
To: Maurizio Boriani <baux@member.fsf.org>
Cc: Guile User Mailing List <guile-user@gnu.org>
Subject: [PATCH 2/12] Guile-DBI: minor cleanup
Date: Fri, 19 Sep 2008 09:05:04 -0500 [thread overview]
Message-ID: <20080919140504.GB13684@linas.org> (raw)
In-Reply-To: <3ae3aa420809190645o2fe2b746id80f53c5cb123e5b@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 3488 bytes --]
Minor cleanup:
-- avoid forward decarations
-- rename confusingly named function
-- free function should return zero, per current guile specs.
-- remove deprecated header
-- fix typo
Signed-off-by: Linas Vepstas <linasvepstas@gmail.com>
---
include/guile-dbi/guile-dbi.h | 10 +++-------
src/guile-dbi.c | 14 ++++----------
2 files changed, 7 insertions(+), 17 deletions(-)
Index: guile-dbi-2.0.0/src/guile-dbi.c
===================================================================
--- guile-dbi-2.0.0.orig/src/guile-dbi.c 2008-09-16 17:26:58.000000000 -0500
+++ guile-dbi-2.0.0/src/guile-dbi.c 2008-09-16 19:54:42.000000000 -0500
@@ -29,11 +29,6 @@
static scm_t_bits g_db_handle_tag;
-static SCM mark_db_handle (SCM g_db_handle_smob);
-static size_t free_db_handle (SCM g_db_handle_smob);
-static int print_db_handle (SCM g_db_handle_smob, SCM port,
- scm_print_state* pstate);
-
#define DBI_SMOB_P(obj) ((SCM_NIMP(obj)) && (SCM_TYP16(obj)==g_db_handle_tag))
@@ -154,7 +149,7 @@ SCM_DEFINE (close_g_db_handle, "dbi-clos
#define FUNC_NAME s_close_db_handle
{
struct g_db_handle *g_db_handle = NULL;
- void (*dbi_close)(gdbi_db_handle_t*);
+ void (*dbd_close)(gdbi_db_handle_t*);
SCM_ASSERT (DBI_SMOB_P(db_handle), db_handle, SCM_ARG1, "close_g_db_handle");
g_db_handle = (struct g_db_handle*)SCM_SMOB_DATA(db_handle);
@@ -164,12 +159,12 @@ SCM_DEFINE (close_g_db_handle, "dbi-clos
return SCM_UNSPECIFIED;
}
- __gdbi_dbd_wrap(g_db_handle,(char*) __FUNCTION__,(void**) &dbi_close);
+ __gdbi_dbd_wrap(g_db_handle,(char*) __FUNCTION__,(void**) &dbd_close);
if (scm_equal_p (SCM_CAR(g_db_handle->status),scm_from_int(0)) == SCM_BOOL_F)
{
return SCM_UNSPECIFIED;
}
- (*dbi_close)(g_db_handle);
+ (*dbd_close)(g_db_handle);
if (g_db_handle->handle)
{
dlclose(g_db_handle->handle);
@@ -185,7 +180,6 @@ static size_t
free_db_handle (SCM g_db_handle_smob)
{
struct g_db_handle *g_db_handle = NULL;
- size_t size = sizeof(struct g_db_handle);
g_db_handle = (struct g_db_handle*)SCM_SMOB_DATA(g_db_handle_smob);
close_g_db_handle(g_db_handle_smob);
@@ -196,7 +190,7 @@ free_db_handle (SCM g_db_handle_smob)
}
SCM_SETCDR (g_db_handle_smob, (SCM)NULL);
- return (size);
+ return 0;
}
Index: guile-dbi-2.0.0/include/guile-dbi/guile-dbi.h
===================================================================
--- guile-dbi-2.0.0.orig/include/guile-dbi/guile-dbi.h 2008-09-16 19:03:18.000000000 -0500
+++ guile-dbi-2.0.0/include/guile-dbi/guile-dbi.h 2008-09-16 19:53:09.000000000 -0500
@@ -17,17 +17,13 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- *
- * Process this file with autoconf to produce a configure script. */
+ */
#ifndef __GUILE_DBI_H__
#define __GUILE_DBI_H__
-
#include <libguile.h>
-#include <guile/gh.h>
-
/* guile smob struct */
typedef struct g_db_handle
@@ -50,8 +46,8 @@ void init_dbi(void);
\f
-/* dbd dynamyc wrapper stuff */
+/* dbd dynamic wrapper stuff */
void __gdbi_dbd_wrap(gdbi_db_handle_t* dbh, char* function_name,
void** function_pointer);
-/* end dbd dynamyc wrapper stuff */
+/* end dbd dynamic wrapper stuff */
#endif
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 481 bytes --]
next prev parent reply other threads:[~2008-09-19 14:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-19 13:45 PATCH [0/12]: Guile-DBI and Guile-DBD-Postgres Linas Vepstas
2008-09-19 14:00 ` [PATCH 1/12] Guile-DBI: Avoid multiple init Linas Vepstas
2008-09-19 14:05 ` Linas Vepstas [this message]
2008-09-19 14:06 ` [PATCH 3/12] Guile-DBI: Fix memory leak Linas Vepstas
2008-09-19 14:09 ` [PATCH 4/12] Guile-DBII: replace deprecated gh_ functions Linas Vepstas
2008-09-19 14:11 ` [PATCH 6/12] Guile-DBI: Fix crash, avoid recursive free Linas Vepstas
2008-09-19 14:13 ` [PATCH 5/12] Guile-DBI: Use remember_upto_here Linas Vepstas
2008-09-19 14:15 ` [PATCH 7/12] Guile-DBI: Don't cast away const Linas Vepstas
2008-09-19 14:17 ` [PATCH 8/12] Guile-DBD-postgres: Fix handling of float point columns Linas Vepstas
2008-09-19 14:19 ` [PATCH 9/12] Guile-DBD-postgres: Avoid discouraged functions Linas Vepstas
2008-09-19 14:20 ` [PATCH 10/12] Guile-DBD-postgres: Fix off-by-one when fetching rows Linas Vepstas
2008-09-19 14:22 ` [PATCH 11/12] Guile-DBD-postgres: Avoid deprecated functions Linas Vepstas
2008-09-19 14:23 ` [PATCH 12/12] Guile-DBD-postgres: Crash in GC Linas Vepstas
2008-09-19 23:00 ` PATCH [0/12]: Guile-DBI and Guile-DBD-Postgres Neil Jerram
2008-09-19 23:22 ` Greg Troxel
2008-09-19 23:24 ` Greg Troxel
2008-09-20 0:19 ` Linas Vepstas
2008-09-20 13:25 ` Greg Troxel
2008-09-20 15:43 ` Linas Vepstas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/guile/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080919140504.GB13684@linas.org \
--to=linasvepstas@gmail.com \
--cc=baux@member.fsf.org \
--cc=guile-user@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).