[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2095-g3f54032

[Volker Lendecke]

The branch, master has been updated
       via  3f5403220f2e3c0df4e436f908b97fe8cafd6616 (commit)
      from  497b9e460b5defd60de89b9c5bed890f83ca86a1 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3f5403220f2e3c0df4e436f908b97fe8cafd6616
Author: Slava Semushin <php-coder at altlinux.ru>
Date:   Sat Jun 6 21:53:38 2009 +0700

    testsuite/nsswitch/get{gr,pw}ent_r.c(dump_{gr,pw}ent): fixed wrong condition.
    
    When fopen() fails it return NULL, so condition where return value
    less than zero never evaluated to truth.
    
    Found by cppcheck.

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

Summary of changes:
 testsuite/nsswitch/getgrent_r.c |    2 +-
 testsuite/nsswitch/getpwent_r.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/testsuite/nsswitch/getgrent_r.c b/testsuite/nsswitch/getgrent_r.c
index 3eac8aa..4f1f0ce 100644
--- a/testsuite/nsswitch/getgrent_r.c
+++ b/testsuite/nsswitch/getgrent_r.c
@@ -21,7 +21,7 @@ void dump_grent(char *id)
 
     sprintf(fname, "/tmp/getgrent_r-%s.out-%d", id, getpid());
 
-    if ((fptr = fopen(fname, "w")) < 0) {
+    if ((fptr = fopen(fname, "w")) == NULL) {
         fprintf(stderr, "ERROR: could not open file %s: %s\n", fname,
                 sys_errlist[errno]);
         return;
diff --git a/testsuite/nsswitch/getpwent_r.c b/testsuite/nsswitch/getpwent_r.c
index 2ba7ea9..5e77491 100644
--- a/testsuite/nsswitch/getpwent_r.c
+++ b/testsuite/nsswitch/getpwent_r.c
@@ -21,7 +21,7 @@ void dump_pwent(char *id)
 
     sprintf(fname, "/tmp/getpwent_r-%s.out-%d", id, getpid());
 
-    if ((fptr = fopen(fname, "w")) < 0) {
+    if ((fptr = fopen(fname, "w")) == 0) {
         fprintf(stderr, "ERROR: could not open file %s: %s\n", fname,
                 sys_errlist[errno]);
         return;


-- 
Samba Shared Repository