Skip to content

Commit a79abf7

Browse files
ejohnstownpadelsbach
authored andcommitted
sftp: fix Atributes typo
Rename SFTP_ParseAtributes_buffer and SFTP_AtributesSz (and the unused SFTP_ParseAtributes) to spell "Attributes".
1 parent 89e0175 commit a79abf7

1 file changed

Lines changed: 17 additions & 17 deletions

File tree

src/wolfsftp.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ typedef struct WS_SFTP_RENAME_STATE {
403403

404404

405405
static int SendPacketType(WOLFSSH* ssh, byte type, byte* buf, word32 bufSz);
406-
static int SFTP_ParseAtributes_buffer(WOLFSSH* ssh, WS_SFTP_FILEATRB* atr,
406+
static int SFTP_ParseAttributes_buffer(WOLFSSH* ssh, WS_SFTP_FILEATRB* atr,
407407
byte* buf, word32* idx, word32 maxIdx);
408408
static WS_SFTPNAME* wolfSSH_SFTPNAME_new(void* heap);
409409

@@ -913,7 +913,7 @@ static int SFTP_GetAttributes_Handle(WOLFSSH* ssh, byte* handle, int handleSz,
913913

914914

915915
/* returns the size of buffer needed to hold attributes */
916-
static int SFTP_AtributesSz(WOLFSSH* ssh, WS_SFTP_FILEATRB* atr)
916+
static int SFTP_AttributesSz(WOLFSSH* ssh, WS_SFTP_FILEATRB* atr)
917917
{
918918
word32 sz = 0;
919919

@@ -1362,7 +1362,7 @@ static int wolfSSH_SFTP_RecvRealPath(WOLFSSH* ssh, int reqId, byte* data,
13621362
/* send response */
13631363
outSz = WOLFSSH_SFTP_HEADER + (UINT32_SZ * 3) + (sSz * 2);
13641364
WMEMSET(&atr, 0, sizeof(WS_SFTP_FILEATRB));
1365-
outSz += SFTP_AtributesSz(ssh, &atr);
1365+
outSz += SFTP_AttributesSz(ssh, &atr);
13661366
lidx = 0;
13671367

13681368
/* reuse state buffer if large enough */
@@ -2069,7 +2069,7 @@ int wolfSSH_SFTP_RecvOpen(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
20692069
}
20702070

20712071
/* @TODO handle attributes */
2072-
SFTP_ParseAtributes_buffer(ssh, &atr, data, &idx, maxSz);
2072+
SFTP_ParseAttributes_buffer(ssh, &atr, data, &idx, maxSz);
20732073
if ((reason & WOLFSSH_FXF_READ) && (reason & WOLFSSH_FXF_WRITE)) {
20742074
WLOG(WS_LOG_SFTP, "Opening file with WOLFSSH_O_RDWR");
20752075
m |= WOLFSSH_O_RDWR;
@@ -2277,7 +2277,7 @@ int wolfSSH_SFTP_RecvOpen(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
22772277

22782278
#if 0
22792279
/* @TODO handle attributes */
2280-
SFTP_ParseAtributes_buffer(ssh, &atr, data, &idx, maxSz);
2280+
SFTP_ParseAttributes_buffer(ssh, &atr, data, &idx, maxSz);
22812281
#endif
22822282

22832283
if (reason & WOLFSSH_FXF_READ) {
@@ -3409,7 +3409,7 @@ static int wolfSSH_SFTP_SendName(WOLFSSH* ssh, WS_SFTPNAME* list, word32 count,
34093409
WS_SUCCESS) {
34103410
return WS_FATAL_ERROR;
34113411
}
3412-
idx += SFTP_AtributesSz(ssh, &cur->atrb);
3412+
idx += SFTP_AttributesSz(ssh, &cur->atrb);
34133413
cur = cur->next;
34143414
}
34153415

@@ -3487,7 +3487,7 @@ int wolfSSH_SFTP_RecvReadDir(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
34873487
if (ret == WS_SUCCESS || ret == WS_NEXT_ERROR) {
34883488
count++;
34893489
outSz += name->fSz + name->lSz + (UINT32_SZ * 2);
3490-
outSz += SFTP_AtributesSz(ssh, &name->atrb);
3490+
outSz += SFTP_AttributesSz(ssh, &name->atrb);
34913491
name->next = list;
34923492
list = name;
34933493
}
@@ -5259,7 +5259,7 @@ int wolfSSH_SFTP_RecvFSTAT(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
52595259
ret = WS_BAD_FILE_E;
52605260
}
52615261
else {
5262-
sz = SFTP_AtributesSz(ssh, &atr);
5262+
sz = SFTP_AttributesSz(ssh, &atr);
52635263
outSz = sz + WOLFSSH_SFTP_HEADER;
52645264
}
52655265

@@ -5338,7 +5338,7 @@ int wolfSSH_SFTP_RecvSTAT(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
53385338
ret = WS_BAD_FILE_E;
53395339
}
53405340
else {
5341-
sz = SFTP_AtributesSz(ssh, &atr);
5341+
sz = SFTP_AttributesSz(ssh, &atr);
53425342
outSz = sz + WOLFSSH_SFTP_HEADER;
53435343
}
53445344
}
@@ -5421,7 +5421,7 @@ int wolfSSH_SFTP_RecvLSTAT(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
54215421
ret = WS_BAD_FILE_E;
54225422
}
54235423
else {
5424-
sz = SFTP_AtributesSz(ssh, &atr);
5424+
sz = SFTP_AttributesSz(ssh, &atr);
54255425
outSz = sz + WOLFSSH_SFTP_HEADER;
54265426
}
54275427
}
@@ -5603,7 +5603,7 @@ int wolfSSH_SFTP_RecvSetSTAT(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
56035603
}
56045604

56055605
if (ret == WS_SUCCESS &&
5606-
SFTP_ParseAtributes_buffer(ssh, &atr, data, &idx, maxSz) != 0) {
5606+
SFTP_ParseAttributes_buffer(ssh, &atr, data, &idx, maxSz) != 0) {
56075607
type = WOLFSSH_FTP_FAILURE;
56085608
res = per;
56095609
ret = WS_BAD_FILE_E;
@@ -5677,7 +5677,7 @@ int wolfSSH_SFTP_RecvFSetSTAT(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
56775677
WMEMCPY((byte*)&fd, str, strSz);
56785678

56795679
if (ret == WS_SUCCESS &&
5680-
SFTP_ParseAtributes_buffer(ssh, &atr, data, &idx, maxSz) != 0) {
5680+
SFTP_ParseAttributes_buffer(ssh, &atr, data, &idx, maxSz) != 0) {
56815681
type = WOLFSSH_FTP_FAILURE;
56825682
res = per;
56835683
ret = WS_BAD_FILE_E;
@@ -6124,7 +6124,7 @@ void wolfSSH_SFTPNAME_list_free(WS_SFTPNAME* n)
61246124
*
61256125
* returns WS_SUCCESS on success
61266126
*/
6127-
int SFTP_ParseAtributes_buffer(WOLFSSH* ssh, WS_SFTP_FILEATRB* atr, byte* buf,
6127+
int SFTP_ParseAttributes_buffer(WOLFSSH* ssh, WS_SFTP_FILEATRB* atr, byte* buf,
61286128
word32* idx, word32 maxIdx)
61296129
{
61306130
word32 localIdx = *idx;
@@ -6225,7 +6225,7 @@ int SFTP_ParseAtributes_buffer(WOLFSSH* ssh, WS_SFTP_FILEATRB* atr, byte* buf,
62256225
*
62266226
* returns WS_SUCCESS on success
62276227
*/
6228-
int SFTP_ParseAtributes(WOLFSSH* ssh, WS_SFTP_FILEATRB* atr)
6228+
int SFTP_ParseAttributes(WOLFSSH* ssh, WS_SFTP_FILEATRB* atr)
62296229
{
62306230
byte buf[UINT32_SZ * 2];
62316231
int ret;
@@ -6536,7 +6536,7 @@ static WS_SFTPNAME* wolfSSH_SFTP_DoName(WOLFSSH* ssh)
65366536

65376537
/* get attributes */
65386538
localIdx = wolfSSH_SFTP_buffer_idx(&state->buffer);
6539-
ret = SFTP_ParseAtributes_buffer(ssh, &tmp->atrb,
6539+
ret = SFTP_ParseAttributes_buffer(ssh, &tmp->atrb,
65406540
wolfSSH_SFTP_buffer_data(&state->buffer),
65416541
&localIdx,
65426542
wolfSSH_SFTP_buffer_size(&state->buffer));
@@ -7036,7 +7036,7 @@ static int SFTP_STAT(WOLFSSH* ssh, char* dir, WS_SFTP_FILEATRB* atr, byte type)
70367036
wolfSSH_SFTP_buffer_rewind(&state->buffer);
70377037
if (state->type == WOLFSSH_FTP_ATTRS) {
70387038
localIdx = wolfSSH_SFTP_buffer_idx(&state->buffer);
7039-
ret = SFTP_ParseAtributes_buffer(ssh, atr,
7039+
ret = SFTP_ParseAttributes_buffer(ssh, atr,
70407040
wolfSSH_SFTP_buffer_data(&state->buffer),
70417041
&localIdx,
70427042
wolfSSH_SFTP_buffer_size(&state->buffer));
@@ -7151,7 +7151,7 @@ int wolfSSH_SFTP_SetSTAT(WOLFSSH* ssh, char* dir, WS_SFTP_FILEATRB* atr)
71517151
switch (state->state) {
71527152
case STATE_SET_ATR_INIT:
71537153
dirSz = (int)WSTRLEN(dir);
7154-
atrSz = SFTP_AtributesSz(ssh, atr);
7154+
atrSz = SFTP_AttributesSz(ssh, atr);
71557155
if (wolfSSH_SFTP_buffer_create(ssh, &state->buffer,
71567156
dirSz + atrSz + WOLFSSH_SFTP_HEADER + UINT32_SZ) !=
71577157
WS_SUCCESS) {

0 commit comments

Comments
 (0)