dbd.h | dbd.h | |||
---|---|---|---|---|
skipping to change at line 20 | skipping to change at line 20 | |||
* | * | |||
* This library is distributed in the hope that it will be useful, | * This library is distributed in the hope that it will be useful, | |||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |||
* Lesser General Public License for more details. | * Lesser General Public License for more details. | |||
* | * | |||
* You should have received a copy of the GNU Lesser General Public | * You should have received a copy of the GNU Lesser General Public | |||
* License along with this library; if not, write to the Free Software | * License along with this library; if not, write to the Free Software | |||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A | |||
* | * | |||
* $Id: dbd.h,v 1.15 2002/06/14 22:08:22 dap Exp $ | * $Id: dbd.h,v 1.17 2002/10/25 22:16:51 dap Exp $ | |||
*/ | */ | |||
#ifndef __DBD_H__ | #ifndef __DBD_H__ | |||
#define __DBD_H__ | #define __DBD_H__ | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
extern "C" { | extern "C" { | |||
#endif | #endif | |||
#include <dbi/dbi.h> | #include <dbi/dbi.h> | |||
#include <dbi/dbi-dev.h> | #include <dbi/dbi-dev.h> | |||
/* FUNCTIONS EXPORTED BY EACH DRIVER */ | /* FUNCTIONS EXPORTED BY EACH DRIVER */ | |||
void dbd_register_driver(const dbi_info_t **_driver_info, const char ***_cu stom_functions, const char ***_reserved_words); | void dbd_register_driver(const dbi_info_t **_driver_info, const char ***_cu stom_functions, const char ***_reserved_words); | |||
int dbd_initialize(dbi_driver_t *driver); | int dbd_initialize(dbi_driver_t *driver); | |||
int dbd_connect(dbi_conn_t *conn); | int dbd_connect(dbi_conn_t *conn); | |||
int dbd_disconnect(dbi_conn_t *conn); | int dbd_disconnect(dbi_conn_t *conn); | |||
int dbd_fetch_row(dbi_result_t *result, unsigned int rownum); | int dbd_fetch_row(dbi_result_t *result, unsigned long long rownum); | |||
int dbd_free_query(dbi_result_t *result); | int dbd_free_query(dbi_result_t *result); | |||
int dbd_goto_row(dbi_result_t *result, unsigned int row); | int dbd_goto_row(dbi_result_t *result, unsigned long long row); | |||
dbi_result_t *dbd_list_dbs(dbi_conn_t *conn, const char *pattern); | dbi_result_t *dbd_list_dbs(dbi_conn_t *conn, const char *pattern); | |||
dbi_result_t *dbd_list_tables(dbi_conn_t *conn, const char *db, const char *pattern); | dbi_result_t *dbd_list_tables(dbi_conn_t *conn, const char *db, const char *pattern); | |||
dbi_result_t *dbd_query(dbi_conn_t *conn, const char *statement); | dbi_result_t *dbd_query(dbi_conn_t *conn, const char *statement); | |||
dbi_result_t *dbd_query_null(dbi_conn_t *conn, const unsigned char *stateme nt, unsigned long st_length); | dbi_result_t *dbd_query_null(dbi_conn_t *conn, const unsigned char *stateme nt, unsigned long st_length); | |||
int dbd_quote_string(dbi_driver_t *driver, const char *orig, char *dest); | int dbd_quote_string(dbi_driver_t *driver, const char *orig, char *dest); | |||
char *dbd_select_db(dbi_conn_t *conn, const char *db); | char *dbd_select_db(dbi_conn_t *conn, const char *db); | |||
int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr); | int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr); | |||
unsigned long long dbd_get_seq_last(dbi_conn_t *conn, const char *sequence) ; | unsigned long long dbd_get_seq_last(dbi_conn_t *conn, const char *sequence) ; | |||
unsigned long long dbd_get_seq_next(dbi_conn_t *conn, const char *sequence) ; | unsigned long long dbd_get_seq_next(dbi_conn_t *conn, const char *sequence) ; | |||
/* _DBD_* DRIVER AUTHORS HELPER FUNCTIONS */ | /* _DBD_* DRIVER AUTHORS HELPER FUNCTIONS */ | |||
dbi_result_t *_dbd_result_create(dbi_conn_t *conn, void *handle, unsigned i | dbi_result_t *_dbd_result_create(dbi_conn_t *conn, void *handle, unsigned l | |||
nt numrows_matched, unsigned int numrows_affected); | ong long numrows_matched, unsigned long long numrows_affected); | |||
void _dbd_result_set_numfields(dbi_result_t *result, unsigned int numfields | void _dbd_result_set_numfields(dbi_result_t *result, unsigned short numfiel | |||
); | ds); | |||
void _dbd_result_add_field(dbi_result_t *result, unsigned int idx, char *na | void _dbd_result_add_field(dbi_result_t *result, unsigned short idx, char * | |||
me, unsigned short type, unsigned int attribs); | name, unsigned short type, unsigned int attribs); | |||
dbi_row_t *_dbd_row_allocate(unsigned int numfields); | dbi_row_t *_dbd_row_allocate(unsigned short numfields); | |||
void _dbd_row_finalize(dbi_result_t *result, dbi_row_t *row, unsigned int i | void _dbd_row_finalize(dbi_result_t *result, dbi_row_t *row, unsigned long | |||
dx); | long idx); | |||
void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, cons t int errno); | void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, cons t int errno); | |||
dbi_result_t *_dbd_result_create_from_stringarray(dbi_conn_t *conn, unsigne d int numrows_matched, const char **stringarray); | dbi_result_t *_dbd_result_create_from_stringarray(dbi_conn_t *conn, unsigne d long long numrows_matched, const char **stringarray); | |||
void _dbd_register_driver_cap(dbi_driver_t *driver, const char *capname, in t value); | void _dbd_register_driver_cap(dbi_driver_t *driver, const char *capname, in t value); | |||
void _dbd_register_conn_cap(dbi_conn_t *conn, const char *capname, int valu e); | void _dbd_register_conn_cap(dbi_conn_t *conn, const char *capname, int valu e); | |||
int _dbd_result_add_to_conn(dbi_result_t *result); | int _dbd_result_add_to_conn(dbi_result_t *result); | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
} | } | |||
#endif /* __cplusplus */ | #endif /* __cplusplus */ | |||
#endif /* __DBD_H__ */ | #endif /* __DBD_H__ */ | |||
End of changes. 5 change blocks. | ||||
13 lines changed or deleted | 13 lines changed or added | |||
dbi-dev.h | dbi-dev.h | |||
---|---|---|---|---|
skipping to change at line 20 | skipping to change at line 20 | |||
* | * | |||
* This library is distributed in the hope that it will be useful, | * This library is distributed in the hope that it will be useful, | |||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |||
* Lesser General Public License for more details. | * Lesser General Public License for more details. | |||
* | * | |||
* You should have received a copy of the GNU Lesser General Public | * You should have received a copy of the GNU Lesser General Public | |||
* License along with this library; if not, write to the Free Software | * License along with this library; if not, write to the Free Software | |||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A | |||
* | * | |||
* $Id: dbi-dev.h,v 1.20 2002/06/14 23:56:18 dap Exp $ | * $Id: dbi-dev.h,v 1.22 2002/10/25 22:16:51 dap Exp $ | |||
*/ | */ | |||
#ifndef __DBI_DEV_H__ | #ifndef __DBI_DEV_H__ | |||
#define __DBI_DEV_H__ | #define __DBI_DEV_H__ | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
extern "C" { | extern "C" { | |||
#endif | #endif | |||
#include <dbi/dbi.h> /* for dbi_conn_error_handler_func */ | #include <dbi/dbi.h> /* for dbi_conn_error_handler_func */ | |||
skipping to change at line 54 | skipping to change at line 54 | |||
long d_long; | long d_long; | |||
long long d_longlong; | long long d_longlong; | |||
float d_float; | float d_float; | |||
double d_double; | double d_double; | |||
char *d_string; | char *d_string; | |||
time_t d_datetime; | time_t d_datetime; | |||
} dbi_data_t; | } dbi_data_t; | |||
typedef struct dbi_row_s { | typedef struct dbi_row_s { | |||
dbi_data_t *field_values; | dbi_data_t *field_values; | |||
int *field_sizes; /* NULL field = 0, string field = len, anything el | unsigned long long *field_sizes; /* NULL field = 0, string field = l | |||
se = -1 */ | en, anything else = -1 */ | |||
/* | ||||
XXX TODO: above is false as of 8/6/02. no -1 */ | ||||
} dbi_row_t; | } dbi_row_t; | |||
typedef struct dbi_result_s { | typedef struct dbi_result_s { | |||
dbi_conn_t_pointer conn; | dbi_conn_t_pointer conn; | |||
void *result_handle; /* will be typecast into conn-specific type */ | void *result_handle; /* will be typecast into conn-specific type */ | |||
unsigned long numrows_matched; /* set immediately after query */ | unsigned long long numrows_matched; /* set immediately after query * | |||
unsigned long numrows_affected; | / | |||
unsigned long long numrows_affected; | ||||
_field_binding_t_pointer field_bindings; | _field_binding_t_pointer field_bindings; | |||
unsigned int numfields; /* can be zero or NULL until first fetchrow */ | unsigned short numfields; /* can be zero or NULL until first fetchro w */ | |||
char **field_names; | char **field_names; | |||
unsigned short *field_types; | unsigned short *field_types; | |||
unsigned int *field_attribs; | unsigned long *field_attribs; | |||
enum { NOTHING_RETURNED, ROWS_RETURNED, GETTING_ROWS } result_state; /* nothing_returned: wasn't a SELECT query. returns_rows: select, but no r ows fetched yet. getting_rows: select, at least one row has been fetched */ | enum { NOTHING_RETURNED, ROWS_RETURNED, GETTING_ROWS } result_state; /* nothing_returned: wasn't a SELECT query. returns_rows: select, but no r ows fetched yet. getting_rows: select, at least one row has been fetched */ | |||
dbi_row_t **rows; /* array of filled rows, elements set to NULL if n ot fetched yet */ | dbi_row_t **rows; /* array of filled rows, elements set to NULL if n ot fetched yet */ | |||
unsigned long currowidx; | unsigned long long currowidx; | |||
} dbi_result_t; | } dbi_result_t; | |||
typedef struct _field_binding_s { | typedef struct _field_binding_s { | |||
void (*helper_function)(_field_binding_t_pointer); | void (*helper_function)(_field_binding_t_pointer); | |||
dbi_result_t *result; | dbi_result_t *result; | |||
const char *fieldname; | const char *fieldname; | |||
void *bindto; | void *bindto; | |||
struct _field_binding_s *next; | struct _field_binding_s *next; | |||
} _field_binding_t; | } _field_binding_t; | |||
skipping to change at line 113 | skipping to change at line 114 | |||
char *string_value; | char *string_value; | |||
int numeric_value; /* use this for port and other numeric settings * / | int numeric_value; /* use this for port and other numeric settings * / | |||
struct dbi_option_s *next; | struct dbi_option_s *next; | |||
} dbi_option_t; | } dbi_option_t; | |||
typedef struct dbi_functions_s { | typedef struct dbi_functions_s { | |||
void (*register_driver)(const dbi_info_t **, const char ***, const c har ***); | void (*register_driver)(const dbi_info_t **, const char ***, const c har ***); | |||
int (*initialize)(dbi_driver_t_pointer); | int (*initialize)(dbi_driver_t_pointer); | |||
int (*connect)(dbi_conn_t_pointer); | int (*connect)(dbi_conn_t_pointer); | |||
int (*disconnect)(dbi_conn_t_pointer); | int (*disconnect)(dbi_conn_t_pointer); | |||
int (*fetch_row)(dbi_result_t *, unsigned int); | int (*fetch_row)(dbi_result_t *, unsigned long long); | |||
int (*free_query)(dbi_result_t *); | int (*free_query)(dbi_result_t *); | |||
int (*goto_row)(dbi_result_t *, unsigned int); | int (*goto_row)(dbi_result_t *, unsigned long long); | |||
int (*get_socket)(dbi_conn_t_pointer); | int (*get_socket)(dbi_conn_t_pointer); | |||
dbi_result_t *(*list_dbs)(dbi_conn_t_pointer, const char *); | dbi_result_t *(*list_dbs)(dbi_conn_t_pointer, const char *); | |||
dbi_result_t *(*list_tables)(dbi_conn_t_pointer, const char *, const char *); | dbi_result_t *(*list_tables)(dbi_conn_t_pointer, const char *, const char *); | |||
dbi_result_t *(*query)(dbi_conn_t_pointer, const char *); | dbi_result_t *(*query)(dbi_conn_t_pointer, const char *); | |||
dbi_result_t *(*query_null)(dbi_conn_t_pointer, const unsigned char *, unsigned long); | dbi_result_t *(*query_null)(dbi_conn_t_pointer, const unsigned char *, unsigned long); | |||
int (*quote_string)(dbi_driver_t_pointer, const char *, char *); | int (*quote_string)(dbi_driver_t_pointer, const char *, char *); | |||
char *(*select_db)(dbi_conn_t_pointer, const char *); | char *(*select_db)(dbi_conn_t_pointer, const char *); | |||
int (*geterror)(dbi_conn_t_pointer, int *, char **); | int (*geterror)(dbi_conn_t_pointer, int *, char **); | |||
unsigned long long (*get_seq_last)(dbi_conn_t_pointer, const char *) ; | unsigned long long (*get_seq_last)(dbi_conn_t_pointer, const char *) ; | |||
unsigned long long (*get_seq_next)(dbi_conn_t_pointer, const char *) ; | unsigned long long (*get_seq_next)(dbi_conn_t_pointer, const char *) ; | |||
End of changes. 8 change blocks. | ||||
10 lines changed or deleted | 13 lines changed or added | |||
dbi.h | dbi.h | |||
---|---|---|---|---|
skipping to change at line 20 | skipping to change at line 20 | |||
* | * | |||
* This library is distributed in the hope that it will be useful, | * This library is distributed in the hope that it will be useful, | |||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |||
* Lesser General Public License for more details. | * Lesser General Public License for more details. | |||
* | * | |||
* You should have received a copy of the GNU Lesser General Public | * You should have received a copy of the GNU Lesser General Public | |||
* License along with this library; if not, write to the Free Software | * License along with this library; if not, write to the Free Software | |||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A | |||
* | * | |||
* $Id: dbi.h,v 1.33 2002/06/14 22:08:22 dap Exp $ | * $Id: dbi.h,v 1.37 2002/10/25 22:16:51 dap Exp $ | |||
*/ | */ | |||
#ifndef __DBI_H__ | #ifndef __DBI_H__ | |||
#define __DBI_H__ | #define __DBI_H__ | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
extern "C" { | extern "C" { | |||
#endif | #endif | |||
#include <stdlib.h> | #include <stdlib.h> | |||
skipping to change at line 89 | skipping to change at line 89 | |||
const char *dbi_driver_get_filename(dbi_driver Driver); | const char *dbi_driver_get_filename(dbi_driver Driver); | |||
const char *dbi_driver_get_description(dbi_driver Driver); | const char *dbi_driver_get_description(dbi_driver Driver); | |||
const char *dbi_driver_get_maintainer(dbi_driver Driver); | const char *dbi_driver_get_maintainer(dbi_driver Driver); | |||
const char *dbi_driver_get_url(dbi_driver Driver); | const char *dbi_driver_get_url(dbi_driver Driver); | |||
const char *dbi_driver_get_version(dbi_driver Driver); | const char *dbi_driver_get_version(dbi_driver Driver); | |||
const char *dbi_driver_get_date_compiled(dbi_driver Driver); | const char *dbi_driver_get_date_compiled(dbi_driver Driver); | |||
dbi_conn dbi_conn_new(const char *name); /* shortcut for dbi_conn_open(dbi_ driver_open("foo")) */ | dbi_conn dbi_conn_new(const char *name); /* shortcut for dbi_conn_open(dbi_ driver_open("foo")) */ | |||
dbi_conn dbi_conn_open(dbi_driver Driver); /* returns an actual instance of the conn */ | dbi_conn dbi_conn_open(dbi_driver Driver); /* returns an actual instance of the conn */ | |||
dbi_driver dbi_conn_get_driver(dbi_conn Conn); | dbi_driver dbi_conn_get_driver(dbi_conn Conn); | |||
int dbi_conn_set_option(dbi_conn Conn, const char *key, char *value); /* if value is NULL, remove option from list */ | int dbi_conn_set_option(dbi_conn Conn, const char *key, const char *value); /* if value is NULL, remove option from list */ | |||
int dbi_conn_set_option_numeric(dbi_conn Conn, const char *key, int value); | int dbi_conn_set_option_numeric(dbi_conn Conn, const char *key, int value); | |||
const char *dbi_conn_get_option(dbi_conn Conn, const char *key); | const char *dbi_conn_get_option(dbi_conn Conn, const char *key); | |||
int dbi_conn_get_option_numeric(dbi_conn Conn, const char *key); | int dbi_conn_get_option_numeric(dbi_conn Conn, const char *key); | |||
const char *dbi_conn_require_option(dbi_conn Conn, const char *key); /* lik e get, but generate an error if key isn't found */ | const char *dbi_conn_require_option(dbi_conn Conn, const char *key); /* lik e get, but generate an error if key isn't found */ | |||
int dbi_conn_require_option_numeric(dbi_conn Conn, const char *key); /* dit to */ | int dbi_conn_require_option_numeric(dbi_conn Conn, const char *key); /* dit to */ | |||
const char *dbi_conn_get_option_list(dbi_conn Conn, const char *current); / * returns key of next option, or the first option key if current is NULL */ | const char *dbi_conn_get_option_list(dbi_conn Conn, const char *current); / * returns key of next option, or the first option key if current is NULL */ | |||
void dbi_conn_clear_option(dbi_conn Conn, const char *key); | void dbi_conn_clear_option(dbi_conn Conn, const char *key); | |||
void dbi_conn_clear_options(dbi_conn Conn); | void dbi_conn_clear_options(dbi_conn Conn); | |||
int dbi_conn_cap_get(dbi_conn Conn, const char *capname); | int dbi_conn_cap_get(dbi_conn Conn, const char *capname); | |||
int dbi_conn_disjoin_results(dbi_conn Conn); | int dbi_conn_disjoin_results(dbi_conn Conn); | |||
skipping to change at line 111 | skipping to change at line 111 | |||
int dbi_conn_error(dbi_conn Conn, const char **errmsg_dest); | int dbi_conn_error(dbi_conn Conn, const char **errmsg_dest); | |||
void dbi_conn_error_handler(dbi_conn Conn, dbi_conn_error_handler_func func tion, void *user_argument); | void dbi_conn_error_handler(dbi_conn Conn, dbi_conn_error_handler_func func tion, void *user_argument); | |||
dbi_error_flag dbi_conn_error_flag(dbi_conn Conn); | dbi_error_flag dbi_conn_error_flag(dbi_conn Conn); | |||
int dbi_conn_set_error(dbi_conn Conn, int errnum, const char *formatstr, .. .); | int dbi_conn_set_error(dbi_conn Conn, int errnum, const char *formatstr, .. .); | |||
int dbi_conn_connect(dbi_conn Conn); | int dbi_conn_connect(dbi_conn Conn); | |||
int dbi_conn_get_socket(dbi_conn Conn); | int dbi_conn_get_socket(dbi_conn Conn); | |||
dbi_result dbi_conn_get_db_list(dbi_conn Conn, const char *pattern); | dbi_result dbi_conn_get_db_list(dbi_conn Conn, const char *pattern); | |||
dbi_result dbi_conn_get_table_list(dbi_conn Conn, const char *db, const cha r *pattern); | dbi_result dbi_conn_get_table_list(dbi_conn Conn, const char *db, const cha r *pattern); | |||
dbi_result dbi_conn_query(dbi_conn Conn, const char *formatstr, ...); | dbi_result dbi_conn_query(dbi_conn Conn, const char *statement); | |||
dbi_result dbi_conn_queryf(dbi_conn Conn, const char *formatstr, ...); | ||||
dbi_result dbi_conn_query_null(dbi_conn Conn, const unsigned char *statemen t, unsigned long st_length); | dbi_result dbi_conn_query_null(dbi_conn Conn, const unsigned char *statemen t, unsigned long st_length); | |||
int dbi_conn_select_db(dbi_conn Conn, const char *db); | int dbi_conn_select_db(dbi_conn Conn, const char *db); | |||
unsigned long long dbi_conn_sequence_last(dbi_conn Conn, const char *name); /* name of the sequence or table */ | unsigned long long dbi_conn_sequence_last(dbi_conn Conn, const char *name); /* name of the sequence or table */ | |||
unsigned long long dbi_conn_sequence_next(dbi_conn Conn, const char *name); | unsigned long long dbi_conn_sequence_next(dbi_conn Conn, const char *name); | |||
dbi_conn dbi_result_get_conn(dbi_result Result); | dbi_conn dbi_result_get_conn(dbi_result Result); | |||
int dbi_result_free(dbi_result Result); | int dbi_result_free(dbi_result Result); | |||
int dbi_result_seek_row(dbi_result Result, unsigned int row); | int dbi_result_seek_row(dbi_result Result, unsigned long long row); | |||
int dbi_result_first_row(dbi_result Result); | int dbi_result_first_row(dbi_result Result); | |||
int dbi_result_last_row(dbi_result Result); | int dbi_result_last_row(dbi_result Result); | |||
int dbi_result_prev_row(dbi_result Result); | int dbi_result_prev_row(dbi_result Result); | |||
int dbi_result_next_row(dbi_result Result); | int dbi_result_next_row(dbi_result Result); | |||
unsigned int dbi_result_get_numrows(dbi_result Result); | unsigned long long dbi_result_get_numrows(dbi_result Result); | |||
unsigned int dbi_result_get_numrows_affected(dbi_result Result); | unsigned long long dbi_result_get_numrows_affected(dbi_result Result); | |||
unsigned int dbi_result_get_field_size(dbi_result Result, const char *field | unsigned long long dbi_result_get_field_size(dbi_result Result, const char | |||
name); | *fieldname); | |||
unsigned int dbi_result_get_field_size_idx(dbi_result Result, unsigned int | unsigned long long dbi_result_get_field_size_idx(dbi_result Result, unsigne | |||
idx); | d short idx); | |||
unsigned int dbi_result_get_field_length(dbi_result Result, const char *fie | unsigned long long dbi_result_get_field_length(dbi_result Result, const cha | |||
ldname); /* size-1 */ | r *fieldname); /* size-1 */ | |||
unsigned int dbi_result_get_field_length_idx(dbi_result Result, unsigned in | unsigned long long dbi_result_get_field_length_idx(dbi_result Result, unsig | |||
t idx); | ned short idx); | |||
int dbi_result_get_field_idx(dbi_result Result, const char *fieldname); | unsigned short dbi_result_get_field_idx(dbi_result Result, const char *fiel | |||
const char *dbi_result_get_field_name(dbi_result Result, unsigned int idx); | dname); | |||
unsigned int dbi_result_get_numfields(dbi_result Result); | const char *dbi_result_get_field_name(dbi_result Result, unsigned short idx | |||
); | ||||
unsigned short dbi_result_get_numfields(dbi_result Result); | ||||
unsigned short dbi_result_get_field_type(dbi_result Result, const char *fie ldname); | unsigned short dbi_result_get_field_type(dbi_result Result, const char *fie ldname); | |||
unsigned short dbi_result_get_field_type_idx(dbi_result Result, unsigned in t idx); | unsigned short dbi_result_get_field_type_idx(dbi_result Result, unsigned sh ort idx); | |||
unsigned long dbi_result_get_field_attrib(dbi_result Result, const char *fi eldname, unsigned long attribmin, unsigned long attribmax); | unsigned long dbi_result_get_field_attrib(dbi_result Result, const char *fi eldname, unsigned long attribmin, unsigned long attribmax); | |||
unsigned long dbi_result_get_field_attrib_idx(dbi_result Result, unsigned i nt idx, unsigned long attribmin, unsigned long attribmax); | unsigned long dbi_result_get_field_attrib_idx(dbi_result Result, unsigned s hort idx, unsigned long attribmin, unsigned long attribmax); | |||
unsigned long dbi_result_get_field_attribs(dbi_result Result, const char *f ieldname); | unsigned long dbi_result_get_field_attribs(dbi_result Result, const char *f ieldname); | |||
unsigned long dbi_result_get_field_attribs_idx(dbi_result Result, unsigned int idx); | unsigned long dbi_result_get_field_attribs_idx(dbi_result Result, unsigned short idx); | |||
int dbi_result_disjoin(dbi_result Result); | int dbi_result_disjoin(dbi_result Result); | |||
int dbi_result_get_fields(dbi_result Result, const char *format, ...); | int dbi_result_get_fields(dbi_result Result, const char *format, ...); | |||
int dbi_result_bind_fields(dbi_result Result, const char *format, ...); | int dbi_result_bind_fields(dbi_result Result, const char *format, ...); | |||
signed char dbi_result_get_char(dbi_result Result, const char *fieldname); | signed char dbi_result_get_char(dbi_result Result, const char *fieldname); | |||
unsigned char dbi_result_get_uchar(dbi_result Result, const char *fieldname ); | unsigned char dbi_result_get_uchar(dbi_result Result, const char *fieldname ); | |||
short dbi_result_get_short(dbi_result Result, const char *fieldname); | short dbi_result_get_short(dbi_result Result, const char *fieldname); | |||
unsigned short dbi_result_get_ushort(dbi_result Result, const char *fieldna me); | unsigned short dbi_result_get_ushort(dbi_result Result, const char *fieldna me); | |||
long dbi_result_get_long(dbi_result Result, const char *fieldname); | long dbi_result_get_long(dbi_result Result, const char *fieldname); | |||
skipping to change at line 192 | skipping to change at line 193 | |||
int dbi_result_bind_string_copy(dbi_result Result, const char *fieldname, c har **bindto); | int dbi_result_bind_string_copy(dbi_result Result, const char *fieldname, c har **bindto); | |||
int dbi_result_bind_binary_copy(dbi_result Result, const char *fieldname, u nsigned char **bindto); | int dbi_result_bind_binary_copy(dbi_result Result, const char *fieldname, u nsigned char **bindto); | |||
int dbi_result_bind_enum(dbi_result Result, const char *fieldname, const ch ar **bindto); | int dbi_result_bind_enum(dbi_result Result, const char *fieldname, const ch ar **bindto); | |||
int dbi_result_bind_set(dbi_result Result, const char *fieldname, const cha r **bindto); | int dbi_result_bind_set(dbi_result Result, const char *fieldname, const cha r **bindto); | |||
int dbi_result_bind_datetime(dbi_result Result, const char *fieldname, time _t *bindto); | int dbi_result_bind_datetime(dbi_result Result, const char *fieldname, time _t *bindto); | |||
/* and now for the same exact thing in index form: */ | /* and now for the same exact thing in index form: */ | |||
signed char dbi_result_get_char_idx(dbi_result Result, unsigned int idx); | signed char dbi_result_get_char_idx(dbi_result Result, unsigned short idx); | |||
unsigned char dbi_result_get_uchar_idx(dbi_result Result, unsigned int idx) | unsigned char dbi_result_get_uchar_idx(dbi_result Result, unsigned short id | |||
; | x); | |||
short dbi_result_get_short_idx(dbi_result Result, unsigned int idx); | short dbi_result_get_short_idx(dbi_result Result, unsigned short idx); | |||
unsigned short dbi_result_get_ushort_idx(dbi_result Result, unsigned int id | unsigned short dbi_result_get_ushort_idx(dbi_result Result, unsigned short | |||
x); | idx); | |||
long dbi_result_get_long_idx(dbi_result Result, unsigned int idx); | long dbi_result_get_long_idx(dbi_result Result, unsigned short idx); | |||
unsigned long dbi_result_get_ulong_idx(dbi_result Result, unsigned int idx) | unsigned long dbi_result_get_ulong_idx(dbi_result Result, unsigned short id | |||
; | x); | |||
long long dbi_result_get_longlong_idx(dbi_result Result, unsigned int idx); | long long dbi_result_get_longlong_idx(dbi_result Result, unsigned short idx | |||
unsigned long long dbi_result_get_ulonglong_idx(dbi_result Result, unsigned | ); | |||
int idx); | unsigned long long dbi_result_get_ulonglong_idx(dbi_result Result, unsigned | |||
short idx); | ||||
float dbi_result_get_float_idx(dbi_result Result, unsigned int idx); | float dbi_result_get_float_idx(dbi_result Result, unsigned short idx); | |||
double dbi_result_get_double_idx(dbi_result Result, unsigned int idx); | double dbi_result_get_double_idx(dbi_result Result, unsigned short idx); | |||
const char *dbi_result_get_string_idx(dbi_result Result, unsigned int idx); | const char *dbi_result_get_string_idx(dbi_result Result, unsigned short idx | |||
const unsigned char *dbi_result_get_binary_idx(dbi_result Result, unsigned | ); | |||
int idx); | const unsigned char *dbi_result_get_binary_idx(dbi_result Result, unsigned | |||
short idx); | ||||
char *dbi_result_get_string_copy_idx(dbi_result Result, unsigned int idx); | char *dbi_result_get_string_copy_idx(dbi_result Result, unsigned short idx) | |||
unsigned char *dbi_result_get_binary_copy_idx(dbi_result Result, unsigned i | ; | |||
nt idx); | unsigned char *dbi_result_get_binary_copy_idx(dbi_result Result, unsigned s | |||
hort idx); | ||||
const char *dbi_result_get_enum_idx(dbi_result Result, unsigned int idx); | const char *dbi_result_get_enum_idx(dbi_result Result, unsigned short idx); | |||
const char *dbi_result_get_set_idx(dbi_result Result, unsigned int idx); | const char *dbi_result_get_set_idx(dbi_result Result, unsigned short idx); | |||
time_t dbi_result_get_datetime_idx(dbi_result Result, unsigned int idx); | time_t dbi_result_get_datetime_idx(dbi_result Result, unsigned short idx); | |||
/* | /* | |||
int dbi_result_bind_char_idx(dbi_result Result, unsigned int idx, char *bin dto); | int dbi_result_bind_char_idx(dbi_result Result, unsigned int idx, char *bin dto); | |||
int dbi_result_bind_uchar_idx(dbi_result Result, unsigned int idx, unsigned char *bindto); | int dbi_result_bind_uchar_idx(dbi_result Result, unsigned int idx, unsigned char *bindto); | |||
int dbi_result_bind_short_idx(dbi_result Result, unsigned int idx, short *b indto); | int dbi_result_bind_short_idx(dbi_result Result, unsigned int idx, short *b indto); | |||
int dbi_result_bind_ushort_idx(dbi_result Result, unsigned int idx, unsigne d short *bindto); | int dbi_result_bind_ushort_idx(dbi_result Result, unsigned int idx, unsigne d short *bindto); | |||
int dbi_result_bind_long_idx(dbi_result Result, unsigned int idx, long *bin dto); | int dbi_result_bind_long_idx(dbi_result Result, unsigned int idx, long *bin dto); | |||
int dbi_result_bind_ulong_idx(dbi_result Result, unsigned int idx, unsigned long *bindto); | int dbi_result_bind_ulong_idx(dbi_result Result, unsigned int idx, unsigned long *bindto); | |||
int dbi_result_bind_longlong_idx(dbi_result Result, unsigned int idx, long long *bindto); | int dbi_result_bind_longlong_idx(dbi_result Result, unsigned int idx, long long *bindto); | |||
int dbi_result_bind_ulonglong_idx(dbi_result Result, unsigned int idx, unsi gned long long *bindto); | int dbi_result_bind_ulonglong_idx(dbi_result Result, unsigned int idx, unsi gned long long *bindto); | |||
End of changes. 14 change blocks. | ||||
43 lines changed or deleted | 49 lines changed or added | |||