[U-Boot] [PATCH v2 3/6] TFTP: rename "server" to "remote"

Luca Ceresoli
2011-04-19T15:29:20Z

Il 19/04/2011 16:18, Detlev Zundel ha scritto:
> Hi Luca,
>
>> With the upcoming TFTP server implementation, the remote node can be
>> either a client or a server, so avoid ambiguities.
>>
>> Signed-off-by: Luca Ceresoli<luca.ceresoli@comelit.it>
>> Cc: Wolfgang Denk<wd@denx.de>
>> ---
>> Changes in v2:
>> - fixed checkpatch issues.
>>
>> net/tftp.c | 42 +++++++++++++++++++++---------------------
>> 1 files changed, 21 insertions(+), 21 deletions(-)
>>
>> diff --git a/net/tftp.c b/net/tftp.c
>> index 00abec3..da545c6 100644
>> --- a/net/tftp.c
>> +++ b/net/tftp.c
>> @@ -55,18 +55,18 @@ enum {
>> TFTP_ERR_FILE_ALREADY_EXISTS = 6,
>> };
>>
>> -static IPaddr_t TftpServerIP;
>> -static int TftpServerPort; /* The UDP port at their end */
>> -static int TftpOurPort; /* The UDP port at our end */
>> +static IPaddr_t TftpRemoteIP;
>> +static int TftpRemotePort; /* The UDP port at their end */
>> +static int TftpOurPort; /* The UDP port at our end */
>> static int TftpTimeoutCount;
>> -static ulong TftpBlock; /* packet sequence number */
>> -static ulong TftpLastBlock; /* last packet sequence number received */
>> -static ulong TftpBlockWrap; /* count of sequence number wraparounds */
>> -static ulong TftpBlockWrapOffset; /* memory offset due to wrapping */
>> +static ulong TftpBlock; /* packet sequence number */
>> +static ulong TftpLastBlock; /* last packet sequence number received */
>> +static ulong TftpBlockWrap; /* count of sequence number wraparounds */
>> +static ulong TftpBlockWrapOffset; /* memory offset due to wrapping */
> These changes are indentation only changes, so they should be in a
> separate patch.

It's needed for checkpatch compliance.

>> static int TftpState;
>> #ifdef CONFIG_TFTP_TSIZE
>> -static int TftpTsize; /* The file size reported by the server */
>> -static short TftpNumchars; /* The number of hashes we printed */
>> +static int TftpTsize; /* The file size reported by the server */
>> +static short TftpNumchars; /* The number of hashes we printed */
> dito.
>
> [...]
>
>> @@ -421,7 +421,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
>>
>> /*
>> * Acknoledge the block just received, which will prompt
>> - * the server for the next one.
>> + * the remote for the next one.
> Hey, while you're at it, please fix the "Acknoledge" typo ;)

Will do.

> [...]
>
>> @@ -568,7 +568,7 @@ TftpStart (void)
>> strncpy(tftp_filename, BootFile, MAX_LEN);
>> tftp_filename[MAX_LEN-1] = 0;
>> } else {
>> - TftpServerIP = string_to_ip (BootFile);
>> + TftpRemoteIP = string_to_ip(BootFile);
> Whitespace fix.

checkpatch again.

Luca