psblas2-dev:

base/modules/psb_serial_mod.f90
 base/serial/psb_dspcnv.f90
 base/serial/psb_zspcnv.f90

Make more readable normal return for in place conversion.

base/modules/psb_serial_mod.f90

@@ -40,24 +40,6 @@ module psb_serial_mod
        & psb_sct => psi_sct
 
 
-  interface psb_csdp
-    subroutine psb_dcsdp(a, b,info,ifc,check,trans,unitd,upd,dupl)
-      use psb_spmat_type
-      type(psb_dspmat_type), intent(in)   :: a
-      type(psb_dspmat_type), intent(inout)  :: b
-      integer, intent(out)        :: info
-      integer, intent(in), optional :: ifc,upd,dupl
-      character, intent(in), optional :: check,trans,unitd
-    end subroutine psb_dcsdp
-    subroutine psb_zcsdp(a, b,info,ifc,check,trans,unitd,upd,dupl)
-      use psb_spmat_type
-      type(psb_zspmat_type), intent(in)   :: a
-      type(psb_zspmat_type), intent(inout)  :: b
-      integer, intent(out)        :: info
-      integer, intent(in), optional :: ifc,upd,dupl
-      character, intent(in), optional :: check,trans,unitd
-    end subroutine psb_zcsdp
-  end interface
 
   interface psb_csrws
     subroutine psb_dcsrws(rw,a,info,trans)

base/serial/psb_dspcnv.f90

@@ -489,7 +489,9 @@ subroutine psb_dspcnv1(a, info, afmt, upd, dupl)
           call psb_errpush(info,name,a_err=ch_err)
           goto 9999
         endif
-        goto 9998
+        call psb_sp_setifld(psb_spmat_asb_,psb_state_,a,info)
+        call psb_erractionrestore(err_act)
+        return
       end if
     end if
 
@@ -555,8 +557,6 @@ subroutine psb_dspcnv1(a, info, afmt, upd, dupl)
 
   endif
 
-9998 continue
-
   call psb_sp_setifld(psb_spmat_asb_,psb_state_,a,info)
 
   call psb_erractionrestore(err_act)

base/serial/psb_zspcnv.f90

@@ -489,7 +489,9 @@ subroutine psb_zspcnv1(a, info, afmt, upd, dupl)
           call psb_errpush(info,name,a_err=ch_err)
           goto 9999
         endif
-        goto 9998
+        call psb_sp_setifld(psb_spmat_asb_,psb_state_,a,info)
+        call psb_erractionrestore(err_act)
+        return
       end if
     end if
 
@@ -555,8 +557,6 @@ subroutine psb_zspcnv1(a, info, afmt, upd, dupl)
 
   endif
 
-9998 continue
-
   call psb_sp_setifld(psb_spmat_asb_,psb_state_,a,info)
 
   call psb_erractionrestore(err_act)