haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed an issue after the merge conflict ...

Browse Source
This commit is contained in:
Kenneth Skovhede
2018-06-08 11:21:43 +02:00
parent 9485339659
commit d01e8f19c4
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Library/Utility/Utility.cs
+5 -3
View File
@@ -65,9 +65,9 @@ namespace Duplicati.Library.Utility
/// </summary>
/// <param name="source">The stream to read from</param>
/// <param name="target">The stream to write to</param>
public static void CopyStream(Stream source, Stream target)
public static long CopyStream(Stream source, Stream target)
{
CopyStream(source, target, true);
return CopyStream(source, target, true);
}
/// <summary>
@@ -77,7 +77,7 @@ namespace Duplicati.Library.Utility
/// <param name="target">The stream to write to</param>
/// <param name="tryRewindSource">True if an attempt should be made to rewind the source stream, false otherwise</param>
/// <param name="buf">Temporary buffer to use (optional)</param>
public static void CopyStream(Stream source, Stream target, bool tryRewindSource, byte[] buf = null)
public static long CopyStream(Stream source, Stream target, bool tryRewindSource, byte[] buf = null)
{
if (tryRewindSource && source.CanSeek)
try { source.Position = 0; }
@@ -95,6 +95,8 @@ namespace Duplicati.Library.Utility
target.Write(buf, 0, read);
total += read;
}
return total;
}
/// <summary>