Changeset 3200

Timestamp:

02/16/08 06:38:41 (7 months ago)

Author:

DRK

Message:

This should clean up the warnings from core.Variant, io.archive.Zip, io.TempFile? and io.vfs.ZipFolder?. However, there are still two warnings in io.archive.Zip which do not give file or line numbers. I'll keep trying to track them down. Refs #919.

Files:

• trunk/tango/core/Variant.d (modified) (1 diff)
• trunk/tango/io/TempFile.d (modified) (1 diff)
• trunk/tango/io/archive/Zip.d (modified) (21 diffs)
• trunk/tango/io/vfs/ZipFolder.d (modified) (6 diffs)

trunk/tango/core/Variant.d

@@ -431 +431 @@
-            }
-        }
-        assert(false);
-    }
-

trunk/tango/io/TempFile.d

@@ -548 +548 @@
-        long seek(long offset, Seek.Anchor anchor = Seek.Anchor.Begin)
-        {
-
+
+
-            if (result is -1)
-                error();

trunk/tango/io/archive/Zip.d

@@ -130 +130 @@
-        // Update lengths in data
-        Data data = this.data;
-
-
+cast(ushort) 
+cast(ushort) 
-
-        // Do it
@@ -315 +315 @@
-        // Update the lengths
-        Data data = *(this.data);
-
-
-data.file_comment_length =
+cast(ushort) 
+cast(ushort) 
+ data.file_comment_length = cast(ushort)
-
-        // Ok; let's do this!
@@ -426 +426 @@
-        // Set up data block
-        Data data = this.data;
-
+cast(ushort) 
-
-        version( BigEndian ) swapAll(data);
@@ -494 +494 @@
-            default:    return Method.Unsupported;
-        }
+
+        assert(false);
-    }
-
@@ -505 +507 @@
-                assert(false, "unsupported compression method");
-        }
+
+        assert(false);
-    }
-
@@ -666 +670 @@
-            case State.Done:
-                return false;
+
+            default:
+                assert(false);
-        }
+
+        assert(false);
-    }
-
@@ -796 +805 @@
-
-            auto used = header.map(cd_data[4..$]);
-
+
+
-
-            // Update offset for next record
@@ -836 +846 @@
-
-        auto file_len = seeker.seek(0, IConduit.Seek.Anchor.End);
+        assert( file_len <= size_t.max );
-
-        // We're going to need min(max_chunk_len, file_len) bytes.
-long
+size_t
-        if( file_len < max_chunk_len )
-
+cast(size_t) 
-        //Stderr.formatln(" . chunk_len = {}", chunk_len);
-
-        // Seek back and read in the chunk.  Don't forget to clean up after
-        // ourselves.
-
+ast(long)c
-        auto chunk_offset = seeker.seek(0, IConduit.Seek.Anchor.Current);
-        //Stderr.formatln(" . chunk_offset = {}", chunk_offset);
@@ -860 +871 @@
-        size_t eocd_loc = -1;
-
-
-
-
+
+
-            {
-
-
-
-
+
+
+
+
+
+
+
-            }
-        }
-
-        // If we didn't find it, then we'll assume that this is not a valid
@@ -1121 +1133 @@
-
-        {
+            assert( entries.length < ushort.max );
+            assert( cd_len < uint.max );
+            assert( cd_pos < uint.max );
+
-            EndOfCDRecord eocdr;
-            eocdr.data.central_directory_entries_on_this_disk =
-
-
-
-
+
+
+
+
+
+
+
-
-            write(output, EndOfCDRecord.signature);
@@ -1186 +1205 @@
-            scope in_counter = new CounterInput(in_chain);
-            in_chain = in_counter;
-
+
+
-
-            // Count the number of bytes going out to the archive
-            scope out_counter = new CounterOutput(out_chain);
-            out_chain = out_counter;
-
+
+
-
-            // Add crc
@@ -1217 +1238 @@
-                    out_chain = compress;
-                    break;
+
+                default:
+                    assert(false);
-            }
-
@@ -1317 +1341 @@
-                    case 0: minver(10); break;
-                    case 8: minver(20); break;
+                    default:
+                        assert(false);
-                }
-
@@ -1350 +1376 @@
-
-        // Save the header
+        assert( header_pos <= int.max );
-        Entry entry;
-        entry.data.fromLocal(header.data);
-        entry.filename = file_name;
-        entry.header_position = header_pos;
-
+cast(int) 
-        entries ~= entry;
-    }
@@ -1382 +1409 @@
-    uint size()
-    {
-;
+
-    }
-
@@ -2230 +2257 @@
-
-    auto span = time.span;
-
+ cast(ushort) (
-        (span.seconds / 2)
-      | (span.minutes << 5)
-
-
-
+)
+
+ cast(ushort) (
-        (cal.getDayOfMonth(time))
-      | (cal.getMonth(time) << 5)
-
+)
-}
-
@@ -2440 +2467 @@
-        // Otherwise, make sure we don't try to read past the end of the slice
-        if( _position+dst.length > length )
-length-_position
+cast(size_t) (length-_position)
-
-        // Seek source stream to the appropriate location.
@@ -2480 +2507 @@
-                if( _position < 0 ) _position = 0;
-                break;
+
+            default:
+                assert(false);
-        }
-
@@ -2540 +2570 @@
-        // Otherwise, make sure we don't try to read past the end of the slice
-        if( dst.length > _length )
-
+cast(size_t) 
-
-        // Do the read
@@ -2619 +2649 @@
-        // slice
-        if( _position+src.length > length )
-length-_position
+cast(size_t) (length-_position)
-
-        // Seek source stream to the appropriate location.
@@ -2664 +2694 @@
-                if( _position < 0 ) _position = 0;
-                break;
+
+            default:
+                assert(false);
-        }
-

trunk/tango/io/vfs/ZipFolder.d

@@ -113 +113 @@
-
-            else if( file.tempFile !is null )
-
-
+
+
+
+
-            else
-                return 0;
@@ -243 +245 @@
-                    break;
-
-                debug( ZipFolder )
-                {
-                default:
-
+debug( ZipFolder ) 
-                            "Entry.dispose_children: unknown type {}",
-                            type);
-                    assert(false);
-                }
-            }
-        }
@@ -725 +724 @@
-        }
-        while( true );
+
+        assert(false);
-    }
-
@@ -989 +990 @@
-            error("ZipFile.size: cannot reliably determine size of a "
-                    "non-existent file");
+
+        assert(false);
-    }
-
@@ -1138 +1141 @@
-            error("ZipFile.input: cannot open non-existent file for input; "
-                    "results would not be very useful");
+
+        assert(false);
-    }
-
@@ -1306 +1311 @@
-                    ~ parent.fullname ~ "/" ~ name
-                    ~ "\" does not exist");
+
+            assert(false);
-        }
-    }