Author: hbelusca Date: Sun Aug 20 21:02:24 2017 New Revision: 75631 URL: http://svn.reactos.org/svn/reactos?rev=75631&view=rev Log: [SETUPLIB]: Code formatting (cut out the too long lines).
Modified: branches/setup_improvements/base/setup/lib/arcname.c Modified: branches/setup_improvements/base/setup/lib/arcname.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/lib/arcname.c?rev=75631&r1=75630&r2=75631&view=diff ============================================================================== --- branches/setup_improvements/base/setup/lib/arcname.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/arcname.c [iso-8859-1] Sun Aug 20 21:02:24 2017 @@ -32,6 +32,8 @@ #include <debug.h> +/* TYPEDEFS *****************************************************************/ + /* Supported adapter types */ typedef enum _ADAPTER_TYPE { @@ -110,7 +112,7 @@ /* FUNCTIONS ****************************************************************/ -PCSTR +/* static */ PCSTR ArcGetNextTokenA( IN PCSTR ArcPath, OUT PANSI_STRING TokenSpecifier, @@ -170,7 +172,7 @@ return ++p; } -PCWSTR +static PCWSTR ArcGetNextTokenU( IN PCWSTR ArcPath, OUT PUNICODE_STRING TokenSpecifier, @@ -233,7 +235,7 @@ } -ULONG +/* static */ ULONG ArcMatchTokenA( IN PCSTR CandidateToken, IN const PCSTR* TokenTable) @@ -248,7 +250,7 @@ return Index; } -ULONG +static ULONG ArcMatchTokenU( IN PCWSTR CandidateToken, IN const PCWSTR* TokenTable) @@ -263,7 +265,7 @@ return Index; } -ULONG +static ULONG ArcMatchToken_UStr( IN PCUNICODE_STRING CandidateToken, IN const PCWSTR* TokenTable) @@ -527,7 +529,8 @@ return STATUS_NOT_SUPPORTED; } - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\Ramdisk%lu", AdapterKey); + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\Ramdisk%lu", AdapterKey); goto Quit; } } @@ -646,14 +649,23 @@ if (ControllerType == CdRomController) // and so, AdapterType == ScsiAdapter and PeripheralType == FDiskPeripheral - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\Scsi\\CdRom%lu", ControllerKey); + { + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\Scsi\\CdRom%lu", ControllerKey); + } else /* Now, ControllerType == DiskController */ if (PeripheralType == CdRomPeripheral) - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\CdRom%lu", PeripheralKey); + { + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\CdRom%lu", PeripheralKey); + } else if (PeripheralType == FDiskPeripheral) - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\Floppy%lu", PeripheralKey); + { + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\Floppy%lu", PeripheralKey); + } else if (PeripheralType == RDiskPeripheral) { @@ -678,7 +690,8 @@ ASSERT(PartEntry->DiskEntry == DiskEntry); } - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\Harddisk%lu\\Partition%lu", + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\Harddisk%lu\\Partition%lu", DiskEntry->DiskNumber, PartitionNumber); } #if 0 @@ -686,7 +699,8 @@ if (PeripheralType == VDiskPeripheral) { // TODO: Check how Win 7+ deals with virtual disks. - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\VirtualHarddisk%lu\\Partition%lu", + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\VirtualHarddisk%lu\\Partition%lu", PeripheralKey, PartitionNumber); } #endif