fixup! Make string marshaling either lax or strict

nulltoken · nulltoken · commit b1e8f5f181e8 · 2013-10-14T23:52:09.000+02:00
diff --git a/LibGit2Sharp/CheckoutCallbacks.cs b/LibGit2Sharp/CheckoutCallbacks.cs
@@ -86,7 +86,7 @@ private void OnGitCheckoutProgress(IntPtr str, UIntPtr completedSteps, UIntPtr t
             if (onCheckoutProgress != null)
             {
                 // Convert null strings into empty strings.
-                FilePath path = (str != IntPtr.Zero) ? LaxFilePathMarshaler.FromNative(str) : FilePath.Empty;
+                FilePath path = LaxFilePathMarshaler.FromNative(str) ?? FilePath.Empty;
 
                 onCheckoutProgress(path.Native, (int)completedSteps, (int)totalSteps);
             }
@@ -103,8 +103,7 @@ private int OnGitCheckoutNotify(
             int result = 0;
             if (this.onCheckoutNotify != null)
             {
-                FilePath path = (pathPtr != IntPtr.Zero) ?
-                    LaxFilePathMarshaler.FromNative(pathPtr) : FilePath.Empty;
+                FilePath path = LaxFilePathMarshaler.FromNative(pathPtr) ?? FilePath.Empty;
                 result = onCheckoutNotify(path.Native, why) ? 0 : 1;
             }
 
diff --git a/LibGit2Sharp/MatchedPathsAggregator.cs b/LibGit2Sharp/MatchedPathsAggregator.cs
@@ -19,7 +19,7 @@ internal class MatchedPathsAggregator : IEnumerable<FilePath>
         internal int OnGitDiffNotify(IntPtr diffListSoFar, IntPtr deltaToAdd, IntPtr matchedPathspec, IntPtr payload)
         {
             // Convert null strings into empty strings.
-            var path = (matchedPathspec != IntPtr.Zero) ? LaxFilePathMarshaler.FromNative(matchedPathspec) : FilePath.Empty;
+            var path = LaxFilePathMarshaler.FromNative(matchedPathspec) ?? FilePath.Empty;
 
             if (matchedPaths.Contains(path))
             {

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ private void OnGitCheckoutProgress(IntPtr str, UIntPtr completedSteps, UIntPtr t`
`86`	`86`	`if (onCheckoutProgress != null)`
`87`	`87`	`{`
`88`	`88`	`// Convert null strings into empty strings.`
`89`		`- FilePath path = (str != IntPtr.Zero) ? LaxFilePathMarshaler.FromNative(str) : FilePath.Empty;`
	`89`	`+ FilePath path = LaxFilePathMarshaler.FromNative(str) ?? FilePath.Empty;`
`90`	`90`
`91`	`91`	`onCheckoutProgress(path.Native, (int)completedSteps, (int)totalSteps);`
`92`	`92`	`}`
`@@ -103,8 +103,7 @@ private int OnGitCheckoutNotify(`
`103`	`103`	`int result = 0;`
`104`	`104`	`if (this.onCheckoutNotify != null)`
`105`	`105`	`{`
`106`		`- FilePath path = (pathPtr != IntPtr.Zero) ?`
`107`		`- LaxFilePathMarshaler.FromNative(pathPtr) : FilePath.Empty;`
	`106`	`+ FilePath path = LaxFilePathMarshaler.FromNative(pathPtr) ?? FilePath.Empty;`
`108`	`107`	`result = onCheckoutNotify(path.Native, why) ? 0 : 1;`
`109`	`108`	`}`
`110`	`109`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ internal class MatchedPathsAggregator : IEnumerable<FilePath>`
`19`	`19`	`internal int OnGitDiffNotify(IntPtr diffListSoFar, IntPtr deltaToAdd, IntPtr matchedPathspec, IntPtr payload)`
`20`	`20`	`{`
`21`	`21`	`// Convert null strings into empty strings.`
`22`		`- var path = (matchedPathspec != IntPtr.Zero) ? LaxFilePathMarshaler.FromNative(matchedPathspec) : FilePath.Empty;`
	`22`	`+ var path = LaxFilePathMarshaler.FromNative(matchedPathspec) ?? FilePath.Empty;`
`23`	`23`
`24`	`24`	`if (matchedPaths.Contains(path))`
`25`	`25`	`{`