From 8d5e24d06120763aad8794a4442efb4aaf7fd473 Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Tue, 12 May 2020 19:02:48 -0700 Subject: [PATCH] Ensure csv column counts are consistent --- build/CodeGen/ResultCodegen.cs | 1 + build/CodeGen/results.csv | 2 +- src/LibHac/Fs/ResultFs.cs | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/CodeGen/ResultCodegen.cs b/build/CodeGen/ResultCodegen.cs index e147d04e..565d533d 100644 --- a/build/CodeGen/ResultCodegen.cs +++ b/build/CodeGen/ResultCodegen.cs @@ -392,6 +392,7 @@ namespace LibHacBuild.CodeGen using (var csv = new CsvReader(new StreamReader(GetResource(name)), CultureInfo.InvariantCulture)) { csv.Configuration.AllowComments = true; + csv.Configuration.DetectColumnCountChanges = true; if (typeof(T) == typeof(ResultInfo)) { diff --git a/build/CodeGen/results.csv b/build/CodeGen/results.csv index 54b2dbf9..85ef30d2 100644 --- a/build/CodeGen/results.csv +++ b/build/CodeGen/results.csv @@ -2,7 +2,7 @@ Module,DescriptionStart,DescriptionEnd,Name,Summary 2,0,999,HandledByAllProcess, 2,1,,PathNotFound,Specified path does not exist 2,2,,PathAlreadyExists,Specified path already exists -2,7,,TargetLocked,Resource already in use (file already opened, savedata filesystem already mounted) +2,7,,TargetLocked,"Resource already in use (file already opened, savedata filesystem already mounted)" 2,8,,DirectoryNotEmpty,Specified directory is not empty when trying to delete it 2,13,,DirectoryStatusChanged, diff --git a/src/LibHac/Fs/ResultFs.cs b/src/LibHac/Fs/ResultFs.cs index 1da7e893..00d083b4 100644 --- a/src/LibHac/Fs/ResultFs.cs +++ b/src/LibHac/Fs/ResultFs.cs @@ -23,7 +23,7 @@ namespace LibHac.Fs public static Result.Base PathNotFound => new Result.Base(ModuleFs, 1); /// Specified path already exists
Error code: 2002-0002; Inner value: 0x402
public static Result.Base PathAlreadyExists => new Result.Base(ModuleFs, 2); - /// Resource already in use (file already opened
Error code: 2002-0007; Inner value: 0xe02
+ /// Resource already in use (file already opened, savedata filesystem already mounted)
Error code: 2002-0007; Inner value: 0xe02
public static Result.Base TargetLocked => new Result.Base(ModuleFs, 7); /// Specified directory is not empty when trying to delete it
Error code: 2002-0008; Inner value: 0x1002
public static Result.Base DirectoryNotEmpty => new Result.Base(ModuleFs, 8);