[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r37185 - trunk/subversion/libsvn_subr

From: Greg Stein <gstein_at_gmail.com>
Date: Sun, 12 Apr 2009 18:05:29 +0200

On Sun, Apr 12, 2009 at 17:14, Arfrever Frehtes Taifersar Arahesis
<Arfrever.FTA_at_gmail.com> wrote:
>...
> +++ trunk/subversion/libsvn_subr/sqlite.c       Sun Apr 12 08:14:29 2009        (r37185)
> @@ -597,8 +597,12 @@ init_sqlite(apr_pool_t *pool)
>                               "thread-safe mode"));
>  #endif
>  #if SQLITE_VERSION_AT_LEAST(3,6,0)
> -  SQLITE_ERR_MSG(sqlite3_config(SQLITE_CONFIG_MULTITHREAD),
> -                 "Could not configure SQLite");
> +  /* If SQLite has been already initialized, sqlite3_config() returns
> +     SQLITE_MISUSE. */
> +  int err = sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
> +  if (err != SQLITE_OK && err != SQLITE_MISUSE)
> +    return svn_error_create(SQLITE_ERROR_CODE(err), NULL,
> +                            "Could not configure SQLite");
>   SQLITE_ERR_MSG(sqlite3_initialize(), "Could not initialize SQLite");
>  #endif

You'll need some braces in there for that variable declaration (can't
(portably) declare the variable mid-block).

Cheers,
-g

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1671264
Received on 2009-04-12 18:05:49 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.