20260515指摘対応6

src/sh/tuk/module/Common_File_Utils.bas

@@ -36,15 +36,13 @@ Sub WriteCSVFromArray( _
 )
     ' === Input validation ===
     If Not IsArray(data) Then
-        Err.Raise 513, , "Input 'data' must be an array."
+        Err.Raise ERR_FILE_INVALID_ARRAY, "WriteCSVFromArray", "Input 'data' must be an array."
     End If
     
-    Dim numDims As Long
-    On Error Resume Next
-    numDims = ArrayDimensions(data)
-    On Error GoTo 0
+    ' === Check if 2D array ===
+    Dim numDims As Long: numDims = ArrayDimensions(data)
     If numDims <> 2 Then
-        Err.Raise 514, , "Input array must be 2-dimensional."
+        Err.Raise ERR_FILE_NOT_2D, "WriteCSVFromArray", "Input array must be 2-dimensional."
     End If
     
     Dim rows As Long, cols As Long
@@ -110,13 +108,12 @@ End Sub
 
 ' Helper function: safely convert any Variant to a string
 Private Function SafeToString(ByVal v As Variant) As String
-    On Error Resume Next
     If IsNull(v) Or IsEmpty(v) Then
         SafeToString = ""
-    Else
-        SafeToString = CStr(v)
+        Exit Function
     End If
-    On Error GoTo 0
+    
+    SafeToString = CStr(v)
 End Function
 
 ' Helper function: get the number of dimensions of an array (1, 2, ...)
@@ -188,11 +185,11 @@ Function ReadCSVAs2DArrayStrict( _
 
     ' === validate expectedColumnCount ===
     If expectedColumnCount <= 0 Then
-        Err.Raise 5001, , "expectedColumnCount must be >= 1."
+        Err.Raise ERR_FILE_INVALID_PARAM, "ReadCSVAs2DArrayStrict", "expectedColumnCount must be >= 1."
     End If
     
     If Dir(filePath) = "" Then
-        Err.Raise 5002, , "File not found: " & filePath
+        Err.Raise ERR_FILE_NOT_FOUND, "ReadCSVAs2DArrayStrict", "File not found: " & filePath
     End If
 
     ' === read csv file ===
@@ -218,12 +215,12 @@ Function ReadCSVAs2DArrayStrict( _
 
     ' === validate empty ===
     If lines.Count = 0 Then
-        Err.Raise 5003, , "CSV file is empty."
+        Err.Raise ERR_FILE_EMPTY, "ReadCSVAs2DArrayStrict", "CSV file is empty."
     End If
 
     If lines.Count = 1 Then
         If hasHeader Then
-            Err.Raise 5005, , "CSV file data is empty."
+            Err.Raise ERR_FILE_NO_DATA, "ReadCSVAs2DArrayStrict", "CSV file data is empty."
         End If
     End If
 
@@ -236,7 +233,7 @@ Function ReadCSVAs2DArrayStrict( _
         actualCols = UBound(rowArr) - LBound(rowArr) + 1
         
         If actualCols <> expectedColumnCount Then
-            Err.Raise 5004, , "Row " & i & ": Expected " & expectedColumnCount & " columns, got " & actualCols & "."
+            Err.Raise ERR_FILE_COLUMN_MISMATCH, "ReadCSVAs2DArrayStrict", "Row " & i & ": Expected " & expectedColumnCount & " columns, got " & actualCols & "."
         End If
     Next i