diff options
| author | Andreas Schneider <anschneider@suse.de> | 2008-07-17 12:25:31 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-07-17 14:16:19 +0200 |
| commit | 2a8ebdca535aed431d51270a2bdcafce0b55bb12 (patch) | |
| tree | 58ed9b0cb4cc500a80e267a9ce584ff4bda3e3b4 /source3/lib | |
| parent | 848558026f8c10366db07053714557a9840e8bc9 (diff) | |
| download | samba-2a8ebdca535aed431d51270a2bdcafce0b55bb12.tar.gz samba-2a8ebdca535aed431d51270a2bdcafce0b55bb12.tar.bz2 samba-2a8ebdca535aed431d51270a2bdcafce0b55bb12.zip | |
Simplify samba_version_string.
This adds a new macro for a vender version function which will be returned
by the samba_version_string() function if defined.
Signed-off-by: Andreas Schneider <anschneider@suse.de>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(This used to be commit 8b9301fbc73f28c657ec81c605760a0ff7a1973a)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/version.c | 45 |
1 files changed, 11 insertions, 34 deletions
diff --git a/source3/lib/version.c b/source3/lib/version.c index 3cae02ad2e..3982646f56 100644 --- a/source3/lib/version.c +++ b/source3/lib/version.c @@ -23,39 +23,16 @@ const char *samba_version_string(void) { -#ifndef SAMBA_VERSION_VENDOR_SUFFIX +#ifdef SAMBA_VERSION_VENDOR_FUNCTION + return SAMBA_VERSION_VENDOR_FUNCTION; +#else /* SAMBA_VERSION_VENDOR_FUNCTION */ + #ifdef SAMBA_VERSION_VENDOR_SUFFIX + #ifdef SAMBA_VERSION_VENDOR_PATCH + return SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX \ + "-" SAMBA_VERSION_VENDOR_PATCH; + #endif /* SAMBA_VERSION_VENDOR_PATCH */ + return SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX; + #endif /* SAMBA_VERSION_VENDOR_SUFFIX */ +#endif /* SAMBA_VERSION_VENDOR_FUNCTION */ return SAMBA_VERSION_OFFICIAL_STRING; -#else - static char *samba_version; - int res; -#ifdef SAMBA_VERSION_VENDOR_PATCH - char *tmp_version; -#endif - - if (samba_version != NULL) - return samba_version; - - res = asprintf(&samba_version, "%s-%s", - SAMBA_VERSION_OFFICIAL_STRING, - SAMBA_VERSION_VENDOR_SUFFIX); - /* - * Can't use smb_panic here due to dependencies - */ - assert(res != -1); - -#ifdef SAMBA_VERSION_VENDOR_PATCH - res = asprintf(&tmp_version, "%s-%d", samba_version, - SAMBA_VERSION_VENDOR_PATCH); - /* - * Can't use smb_panic here due to dependencies - */ - assert(res != -1); - - SAFE_FREE(samba_version); - - samba_version = tmp_version; -#endif - - return samba_version; -#endif } |