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.in,v 1.13 2012/12/03 00:13:30 mhoenicka Exp $ * $Id: dbi.h.in,v 1.14 2013/04/18 23:55:40 mhoenicka 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 45 skipping to change at line 45
#ifndef LIBDBI_API_DEPRECATED #ifndef LIBDBI_API_DEPRECATED
#if defined _MSC_VER && _MSC_VER >= 1300 #if defined _MSC_VER && _MSC_VER >= 1300
#define LIBDBI_API_DEPRECATED __declspec(deprecated) #define LIBDBI_API_DEPRECATED __declspec(deprecated)
#elif defined __GNUC__ && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)) #elif defined __GNUC__ && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
#define LIBDBI_API_DEPRECATED __attribute__((__deprecated__)) #define LIBDBI_API_DEPRECATED __attribute__((__deprecated__))
#else #else
#define LIBDBI_API_DEPRECATED /**/ #define LIBDBI_API_DEPRECATED /**/
#endif #endif
#endif #endif
/* hide the __attribute__ magic from non-GNU C compilers */
#ifndef __GNUC__
#define __attribute__(_arg_)
#endif
/* opaque type definitions */ /* opaque type definitions */
typedef void * dbi_inst; typedef void * dbi_inst;
typedef void * dbi_driver; typedef void * dbi_driver;
typedef void * dbi_conn; typedef void * dbi_conn;
typedef void * dbi_result; typedef void * dbi_result;
/* other type definitions */ /* other type definitions */
typedef enum { typedef enum {
DBI_ERROR_USER = -10, /* must be the first in the list */ DBI_ERROR_USER = -10, /* must be the first in the list */
DBI_ERROR_DBD = -9, DBI_ERROR_DBD = -9,
skipping to change at line 216 skipping to change at line 221
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);
void dbi_conn_close(dbi_conn Conn); void dbi_conn_close(dbi_conn Conn);
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 LIBDBI_API_DEPRECATED dbi_conn_error_flag(dbi_conn Conn); dbi_error_flag LIBDBI_API_DEPRECATED 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, .. .) __attribute__ ((format (printf, 3, 4)));
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);
unsigned int dbi_conn_get_engine_version(dbi_conn Conn); unsigned int dbi_conn_get_engine_version(dbi_conn Conn);
char *dbi_conn_get_engine_version_string(dbi_conn Conn, char *versionstring ); char *dbi_conn_get_engine_version_string(dbi_conn Conn, char *versionstring );
const char *dbi_conn_get_encoding(dbi_conn Conn); const char *dbi_conn_get_encoding(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 *statement); 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_queryf(dbi_conn Conn, const char *formatstr, ...) __att ribute__ ((format (printf, 2, 3)));
dbi_result dbi_conn_query_null(dbi_conn Conn, const unsigned char *statemen t, size_t st_length); dbi_result dbi_conn_query_null(dbi_conn Conn, const unsigned char *statemen t, size_t 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);
int dbi_conn_ping(dbi_conn Conn); int dbi_conn_ping(dbi_conn Conn);
size_t dbi_conn_quote_string_copy(dbi_conn Conn, const char *orig, char **n ewstr); size_t dbi_conn_quote_string_copy(dbi_conn Conn, const char *orig, char **n ewstr);
size_t dbi_conn_quote_string(dbi_conn Conn, char **orig); size_t dbi_conn_quote_string(dbi_conn Conn, char **orig);
size_t dbi_conn_quote_binary_copy(dbi_conn Conn, const unsigned char *orig, size_t from_length, unsigned char **newstr); size_t dbi_conn_quote_binary_copy(dbi_conn Conn, const unsigned char *orig, size_t from_length, unsigned char **newstr);
size_t dbi_conn_escape_string_copy(dbi_conn Conn, const char *orig, char ** newstr); size_t dbi_conn_escape_string_copy(dbi_conn Conn, const char *orig, char ** newstr);
size_t dbi_conn_escape_string(dbi_conn Conn, char **orig); size_t dbi_conn_escape_string(dbi_conn Conn, char **orig);
 End of changes. 4 change blocks. 
3 lines changed or deleted 8 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/