Commit 8b8ed215 authored by Rob Swindell's avatar Rob Swindell 💬
Browse files

Merge remote-tracking branch 'origin/master'

parents bec4667e 71388a19
Pipeline #1178 passed with stage
in 16 minutes and 22 seconds
......@@ -204,6 +204,7 @@ var K_NOSPIN =(1<<21); /* Do not honor user's spinning cursor */
var K_ANSI_CPR =(1<<22); /* ANSI Cursor Position Report expected */
var K_TRIM =(1<<23); /* Trim white-space from both ends of str */
var K_CTRLKEYS =(1<<24); /* No control-key handling/eating in inkey()*/
var K_NUL =(1<<25); /* Return null instead of "" upon timeout */
/********************************************/
/********************************************/
......
......@@ -589,7 +589,7 @@ uint8_t* smb_getattachment(smbmsg_t* msg, char* buf, char* filename, size_t file
if(filelen != NULL)
*filelen = strlen(buf);
}
return buf;
return (uint8_t*)buf;
}
/* Return number of file attachments contained in MIME-encoded message body */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment