IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2026-09-03 20:53:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixups to dbi backend:

Browse Source 
* dbi_conn_error_flag is deprecated, replace with dbi_conn_error
  (Thanks, Christian).

* Switch from OS-determined HOST_NAME_MAX to locally defined
  GNC_HOSTNAME_MAX so that the field is always 255 regardless of what
  OS creates it.

* Use G_OS_WIN32 instead of naked WIN32


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19740 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
John Ralls
2010-11-01 16:43:51 +00:00
parent a7c83bc43f
commit ff67038cde
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/dbi/gnc-backend-dbi.c
+10 -12
View File
@@ -58,19 +58,16 @@
#include "splint-defs.h"
#endif
#ifdef WIN32
#ifdef G_OS_WIN32
#include <Winsock2.h>
#define HOST_NAME_MAX 255
#define GETPID() GetCurrentProcessId()
#else
#include <limits.h>
#include <unistd.h>
#ifdef DARWIN
#define HOST_NAME_MAX _POSIX_HOST_NAME_MAX
#endif
#define GETPID() getpid()
#endif
#define GNC_HOST_NAME_MAX 255
#define TRANSACTION_NAME "trans"
static QofLogModule log_module = G_LOG_DOMAIN;
@@ -333,6 +330,7 @@ gnc_dbi_sqlite3_session_begin( QofBackend *qbe, QofSession *session,
result = dbi_conn_connect( be->conn );
g_free( basename );
g_free( dirname );
/* Need some better error handling here. In particular, need to emit a QOF_ERROR_LOCKED if the database is in use by another process. */
if ( result < 0 )
{
PERR( "Unable to connect to %s: %d\n", book_id, result );
@@ -478,8 +476,8 @@ gnc_dbi_lock_database ( QofBackend* qbe, gboolean ignore_lock )
dbi_result_free( result );
result = NULL;
}
result = dbi_conn_queryf( dcon, "CREATE TABLE GNCLOCK ( Hostname varchar(%d), PID int )", HOST_NAME_MAX );
if ( dbi_conn_error_flag( dcon ) )
result = dbi_conn_queryf( dcon, "CREATE TABLE GNCLOCK ( Hostname varchar(%d), PID int )", GNC_HOST_NAME_MAX );
if ( dbi_conn_error( dcon, NULL ) )
{
const gchar *errstr;
dbi_conn_error( dcon, &errstr );
@@ -503,7 +501,7 @@ gnc_dbi_lock_database ( QofBackend* qbe, gboolean ignore_lock )
if ( (result = dbi_conn_query( dcon, "BEGIN" )) )
{
/* Check for an existing entry; delete it if ignore_lock is true, otherwise fail */
gchar hostname[ HOST_NAME_MAX + 1 ];
gchar hostname[ GNC_HOST_NAME_MAX + 1 ];
if (result)
{
dbi_result_free( result );
@@ -541,7 +539,7 @@ gnc_dbi_lock_database ( QofBackend* qbe, gboolean ignore_lock )
}
/* Add an entry and commit the transaction */
memset( hostname, 0, sizeof(hostname) );
gethostname( hostname, HOST_NAME_MAX );
gethostname( hostname, GNC_HOST_NAME_MAX );
result = dbi_conn_queryf( dcon,
"INSERT INTO GNCLOCK VALUES ('%s', '%d')",
hostname, (int)GETPID() );
@@ -588,7 +586,7 @@ gnc_dbi_unlock( QofBackend *qbe )
const gchar *dbname = NULL;
g_return_if_fail( dcon != NULL );
g_return_if_fail( dbi_conn_error_flag( dcon ) == 0 );
g_return_if_fail( dbi_conn_error( dcon, NULL ) == 0 );
dbname = dbi_conn_get_option( dcon, "dbname" );
/* Check if the lock table exists */
@@ -607,14 +605,14 @@ gnc_dbi_unlock( QofBackend *qbe )
if ( ( result = dbi_conn_query( dcon, "BEGIN" )) )
{
/* Delete the entry if it's our hostname and PID */
gchar hostname[ HOST_NAME_MAX + 1 ];
gchar hostname[ GNC_HOST_NAME_MAX + 1 ];
if (result)
{
dbi_result_free( result );
result = NULL;
}
memset( hostname, 0, sizeof(hostname) );
gethostname( hostname, HOST_NAME_MAX );
gethostname( hostname, GNC_HOST_NAME_MAX );
result = dbi_conn_queryf( dcon, "SELECT * FROM GNCLOCK WHERE Hostname = '%s' AND PID = '%d'", hostname, (int)GETPID() );
if ( result && dbi_result_get_numrows( result ) )
{