DataHandle: tweak readString, skip and skipBytes

They can lean on the available(long) method.

Author: ctrueden

src/main/java/org/scijava/io/DataHandle.java

@@ -233,10 +233,9 @@ default String readCString() throws IOException {
 	}
 
 	/** Reads a string of up to length n. */
-	default String readString(int n) throws IOException {
-		final long avail = length() - offset();
-		if (n > avail) n = (int) avail;
-		final byte[] b = new byte[n];
+	default String readString(final int n) throws IOException {
+		final int r = (int) available(n);
+		final byte[] b = new byte[r];
 		readFully(b);
 		return new String(b, getEncoding());
 	}
@@ -432,11 +431,10 @@ default int read(byte[] b) throws IOException {
 	 * @throws IOException - if an I/O error occurs.
 	 */
 	default long skip(final long n) throws IOException {
-		if (n < 0) return 0;
-		final long remain = length() - offset();
-		final long num = n < remain ? n : remain;
-		seek(offset() + num);
-		return num;
+		final long skip = available(n);
+		if (skip <= 0) return 0;
+		seek(offset() + skip);
+		return skip;
 	}
 
 	// -- DataInput methods --
@@ -559,10 +557,10 @@ default String readUTF() throws IOException {
 
 	@Override
 	default int skipBytes(final int n) throws IOException {
-		final int skipped = (int) Math.min(n, length() - offset());
-		if (skipped < 0) return 0;
-		seek(offset() + skipped);
-		return skipped;
+		final int skip = (int) Math.min(n, length() - offset());
+		if (skip < 0) return 0;
+		seek(offset() + skip);
+		return skip;
 	}
 
 	// -- DataOutput methods --