[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28a-1165-g614063e

[Jeremy Allison]

The branch, v3-0-test has been updated
       via  614063e0b892adb31c4b5c016669bc8e68da7632 (commit)
      from  2cb052f4cfbaa12ca3333eda06cd3baed986d599 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test


- Log -----------------------------------------------------------------
commit 614063e0b892adb31c4b5c016669bc8e68da7632
Author: Jeremy Allison <jra at samba.org>
Date:   Wed May 14 19:02:14 2008 -0700

    Fix two "this will never be null" warnings.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/smbd/utmp.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/utmp.c b/source/smbd/utmp.c
index b1735df..8a7ac26 100644
--- a/source/smbd/utmp.c
+++ b/source/smbd/utmp.c
@@ -221,13 +221,13 @@ static void uw_pathname(pstring fname, const char *uw_name, const char *uw_defau
 	}
 
 	/* For u-files and non-explicit w-dir, look for "utmp dir" */
-	if (dirname == 0 || strlen(dirname) == 0) {
+	if (strlen(dirname) == 0) {
 		pstrcpy(dirname,lp_utmpdir());
 		trim_char(dirname,'\0','/');
 	}
 
 	/* If explicit directory above, use it */
-	if (dirname != 0 && strlen(dirname) != 0) {
+	if (strlen(dirname) != 0) {
 		pstrcpy(fname, dirname);
 		pstrcat(fname, "/");
 		pstrcat(fname, uw_name);


-- 
Samba Shared Repository