Re: [cvs] bogofilter/src datastore_db.c,1.161.2.2,1.161.2.3

[Matthias A. <mat...@gm...>]

David Relson <re...@us...> writes:

> Log Message:
> Revise db_version_str to identify TRANSACTIONAL vs NON-TRANSACTIONAL.
>
> Index: datastore_db.c
> ===================================================================
> RCS file: /cvsroot/bogofilter/bogofilter/src/datastore_db.c,v
> retrieving revision 1.161.2.2
> retrieving revision 1.161.2.3
> diff -u -d -r1.161.2.2 -r1.161.2.3
> --- datastore_db.c	30 Jan 2005 00:28:27 -0000	1.161.2.2
> +++ datastore_db.c	30 Jan 2005 22:53:45 -0000	1.161.2.3
> @@ -321,14 +321,20 @@
>  
>  const char *db_version_str(void)
>  {
> +    static char v[80];
> +
>  #ifdef DB_VERSION_STRING
> -    static const char v[] = DB_VERSION_STRING;
> +    strcpy(v, DB_VERSION_STRING);
>  #else
> -    static char v[80];
> -    snprintf(v, sizeof(v), "BerkeleyDB (%d.%d.%d)%s",
> -	     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
> -	     fTransactional ? "" : "NONTRANSACTIONAL");
> +    snprintf(v, sizeof(v), "BerkeleyDB (%d.%d.%d)",
> +	     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH);
>  #endif
> +
> +    if (fTransaction)
> +	strcat(v, " TRANSACTIONAL");
> +    else
> +	strcat(v, " NON-TRANSACTIONAL");
> +
>      return v;
>  }

Perhaps we'd be better of mentioning that the implementation can do
either, to avoid confusion. Bogofilter needn't open the environment when
given the -V option and might hence return data that doesn't match the
default wordlist.

-- 
Matthias Andree