DEVEL15-uphys-invalidate-returns-void-20081130

LICENSE IPL10
FIXES 123723

thanks to Hartmut Reuter for catching this.

(cherry picked from commit 96996e65fcd569565e78b7af79258dfad3b0d261)

diff --git a/src/ubik/recovery.c b/src/ubik/recovery.c
index a6293e5c30262cddf9a8b3cc1cda9cf8c749226a..ae1bad02b3da27f729bb1cbae8f48ea8fd2cb1fb 100644 (file)
--- a/src/ubik/recovery.c
+++ b/src/ubik/recovery.c
@@ -679,15 +679,15 @@ urecovery_Interact(void *dummy)
 #endif
                if (!code) 
                    code = rename(pbuffer, tbuffer);
-               if (!code) 
-                   code = (*ubik_dbase->open) (ubik_dbase, 0);
-               if (!code)
+               if (!code) {
+                   (*ubik_dbase->open) (ubik_dbase, 0);
 #endif
-               /* after data is good, sync disk with correct label */
-               code =
-                   (*ubik_dbase->setlabel) (ubik_dbase, 0,
-                                            &ubik_dbase->version);
+                   /* after data is good, sync disk with correct label */
+                   code =
+                       (*ubik_dbase->setlabel) (ubik_dbase, 0,
+                                                &ubik_dbase->version);
 #ifndef OLD_URECOVERY
+               }
 #ifdef AFS_NT40_ENV
                afs_snprintf(pbuffer, sizeof(pbuffer), "%s.DB0.OLD", ubik_dbase->pathName);
                unlink(pbuffer);

diff --git a/src/ubik/remote.c b/src/ubik/remote.c
index 804fb7badb6e0e67c6b6c8c78b8eb6e3875fb6be..e9f2839595e9bffcf42b2c19e5376857131fb158 100644 (file)
--- a/src/ubik/remote.c
+++ b/src/ubik/remote.c
@@ -618,12 +618,12 @@ SDISK_SendFile(rxcall, file, length, avers)
 #endif
     if (!code) 
        code = rename(pbuffer, tbuffer);
-    if (!code) 
-       code = (*ubik_dbase->open) (ubik_dbase, 0);
-    if (!code)
+    if (!code) {
+       (*ubik_dbase->open) (ubik_dbase, 0);
 #endif
-    code = (*ubik_dbase->setlabel) (dbase, file, avers);
+       code = (*ubik_dbase->setlabel) (dbase, file, avers);
 #ifndef OLD_URECOVERY
+    }
 #ifdef AFS_NT40_ENV
     afs_snprintf(pbuffer, sizeof(pbuffer), "%s.DB0.OLD", ubik_dbase->pathName);
     unlink(pbuffer);