From: Linas Vepstas <linasvepstas@gmail.com>
To: Maurizio Boriani <baux@member.fsf.org>
Cc: Guile User Mailing List <guile-user@gnu.org>
Subject: [PATCH 7/12] Guile-DBI: Don't cast away const
Date: Fri, 19 Sep 2008 09:15:20 -0500 [thread overview]
Message-ID: <20080919141520.GG13684@linas.org> (raw)
In-Reply-To: <3ae3aa420809190645o2fe2b746id80f53c5cb123e5b@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 3868 bytes --]
Avoid casting away const. Actually, avoid casting.
Signed-off-by: Linas Vepstas <linasvepstas@gmail.com>
---
include/guile-dbi/guile-dbi.h | 2 +-
src/guile-dbi.c | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
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 21:40:30.000000000 -0500
+++ guile-dbi-2.0.0/include/guile-dbi/guile-dbi.h 2008-09-16 21:40:43.000000000 -0500
@@ -48,7 +48,7 @@ void init_dbi(void);
\f
/* dbd dynamic wrapper stuff */
-void __gdbi_dbd_wrap(gdbi_db_handle_t* dbh, char* function_name,
+void __gdbi_dbd_wrap(gdbi_db_handle_t* dbh, const char* function_name,
void** function_pointer);
/* end dbd dynamic wrapper stuff */
#endif
Index: guile-dbi-2.0.0/src/guile-dbi.c
===================================================================
--- guile-dbi-2.0.0.orig/src/guile-dbi.c 2008-09-16 21:40:30.000000000 -0500
+++ guile-dbi-2.0.0/src/guile-dbi.c 2008-09-16 21:42:31.000000000 -0500
@@ -80,7 +80,7 @@ SCM_DEFINE (make_g_db_handle, "dbi-open"
SCM_RETURN_NEWSMOB (g_db_handle_tag, g_db_handle);
}
- __gdbi_dbd_wrap(g_db_handle,(char*) __FUNCTION__,(void**) &connect);
+ __gdbi_dbd_wrap(g_db_handle, __FUNCTION__,(void**) &connect);
if (scm_equal_p (SCM_CAR(g_db_handle->status),scm_from_int(0)) == SCM_BOOL_F)
{
free(bcknd_str);
@@ -166,7 +166,7 @@ SCM_DEFINE (close_g_db_handle, "dbi-clos
return SCM_UNSPECIFIED;
}
- __gdbi_dbd_wrap(g_db_handle,(char*) __FUNCTION__,(void**) &dbd_close);
+ __gdbi_dbd_wrap(g_db_handle, __FUNCTION__,(void**) &dbd_close);
if (scm_equal_p (SCM_CAR(g_db_handle->status),scm_from_int(0)) == SCM_BOOL_F)
{
scm_remember_upto_here_1(db_handle);
@@ -223,7 +223,7 @@ SCM_DEFINE (query_g_db_handle, "dbi-quer
g_db_handle = (struct g_db_handle*)SCM_SMOB_DATA(db_handle);
query_str = scm_to_locale_string(query);
- __gdbi_dbd_wrap(g_db_handle,(char*) __FUNCTION__,(void**) &dbi_query);
+ __gdbi_dbd_wrap(g_db_handle, __FUNCTION__,(void**) &dbi_query);
if (scm_equal_p (SCM_CAR(g_db_handle->status),scm_from_int(0)) == SCM_BOOL_T)
{
(*dbi_query)(g_db_handle,query_str);
@@ -249,7 +249,7 @@ SCM_DEFINE (getrow_g_db_handle, "dbi-get
SCM_ASSERT (DBI_SMOB_P(db_handle), db_handle, SCM_ARG1, "getrow_g_db_handle");
g_db_handle = (struct g_db_handle*)SCM_SMOB_DATA(db_handle);
- __gdbi_dbd_wrap(g_db_handle,(char*) __FUNCTION__,(void**) &dbi_getrow);
+ __gdbi_dbd_wrap(g_db_handle, __FUNCTION__,(void**) &dbi_getrow);
if (scm_equal_p (SCM_CAR(g_db_handle->status),scm_from_int(0)) == SCM_BOOL_F)
{
scm_remember_upto_here_1(db_handle);
@@ -317,7 +317,7 @@ init_dbi(void)
\f
/* dbd handler */
void
-__gdbi_dbd_wrap(gdbi_db_handle_t* dbh, char* function_name,
+__gdbi_dbd_wrap(gdbi_db_handle_t* dbh, const char* function_name,
void** function_pointer)
{
char *ret = NULL;
@@ -337,13 +337,13 @@ __gdbi_dbd_wrap(gdbi_db_handle_t* dbh, c
}
sprintf(func,"__%s_%s",bcknd,function_name);
- *(void **) (function_pointer) = dlsym(dbh->handle,func);
+ *function_pointer = dlsym(dbh->handle,func);
if((ret = dlerror()) != NULL)
{
free(bcknd);
free(func);
if (dbh->in_free) return; /* do not SCM anything while in GC */
- dbh->status = (SCM) scm_cons(scm_from_int(1),
+ dbh->status = scm_cons(scm_from_int(1),
scm_makfrom0str(ret));
return;
}
@@ -358,5 +358,4 @@ __gdbi_dbd_wrap(gdbi_db_handle_t* dbh, c
/* todo: error msg to be translated */
dbh->status = scm_cons(scm_from_int(0),
scm_makfrom0str("symbol loaded"));
- return;
}
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 481 bytes --]
next prev parent reply other threads:[~2008-09-19 14:15 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 ` [PATCH 2/12] Guile-DBI: minor cleanup Linas Vepstas
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 ` Linas Vepstas [this message]
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=20080919141520.GG13684@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).