Deprecate TaintedString (#15423)
Co-authored-by: Timothee Cour <timothee.cour2@gmail.com> Co-authored-by: Dominik Picheta <dominikpicheta@googlemail.com>
This commit is contained in:
parent
7b632f9ccb
commit
78a99587a4
36 changed files with 184 additions and 229 deletions
|
|
@ -225,7 +225,7 @@ template raise_or_quit(exception, message: untyped) =
|
|||
|
||||
template run_custom_proc(parsed_parameter: Tparsed_parameter,
|
||||
custom_validator: Tparameter_callback,
|
||||
parameter: TaintedString) =
|
||||
parameter: string) =
|
||||
## Runs the custom validator if it is not nil.
|
||||
##
|
||||
## Pass in the string of the parameter triggering the call. If the
|
||||
|
|
@ -318,7 +318,7 @@ proc echo_help*(expected: seq[Tparameter_specification] = @[],
|
|||
|
||||
|
||||
proc parse*(expected: seq[Tparameter_specification] = @[],
|
||||
type_of_positional_parameters = PK_STRING, args: seq[TaintedString] = @[],
|
||||
type_of_positional_parameters = PK_STRING, args: seq[string] = @[],
|
||||
bad_prefixes = @["-", "--"], end_of_options = "--",
|
||||
quit_on_failure = true): Tcommandline_results =
|
||||
## Parses parameters and returns results.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import streams
|
||||
from strutils import repeat
|
||||
|
||||
proc readPaddedStr*(s: PStream, length: int, padChar = '\0'): TaintedString =
|
||||
proc readPaddedStr*(s: PStream, length: int, padChar = '\0'): string =
|
||||
var lastChr = length
|
||||
result = s.readStr(length)
|
||||
while lastChr >= 0 and result[lastChr - 1] == padChar: dec(lastChr)
|
||||
|
|
@ -16,7 +16,7 @@ proc writePaddedStr*(s: PStream, str: string, length: int, padChar = '\0') =
|
|||
else:
|
||||
s.write(str)
|
||||
|
||||
proc readLEStr*(s: PStream): TaintedString =
|
||||
proc readLEStr*(s: PStream): string =
|
||||
var len = s.readInt16()
|
||||
result = s.readStr(len)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue