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 <[EMAIL PROTECTED]>
---
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);
-/* 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
signature.asc
Description: Digital signature
