Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-03 13:26:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #253 from link2xt/is_file_size_okay-bool

Browse Source 
Return bool from is_file_size_okay
This commit is contained in:
Friedel Ziegelmayer
2019-07-30 00:24:13 +02:00
committed by GitHub
parent 1fbd16310a dfce34f275
commit 5bf2d7c5ac
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dc_mimefactory.rs
View File

@@ -844,7 +844,7 @@ pub unsafe fn dc_mimefactory_render(mut factory: *mut dc_mimefactory_t) -> libc:
/* add attachment part */ /* add attachment part */
if msgtype_has_file((*msg).type_0) { if msgtype_has_file((*msg).type_0) {
if 0 == is_file_size_okay(msg) { if !is_file_size_okay(msg) {
let error: *mut libc::c_char = dc_mprintf( let error: *mut libc::c_char = dc_mprintf(
b"Message exceeds the recommended %i MB.\x00" as *const u8 b"Message exceeds the recommended %i MB.\x00" as *const u8
as *const libc::c_char, as *const libc::c_char,
@@ -1328,13 +1328,13 @@ unsafe fn build_body_file(
* Render * Render
******************************************************************************/ ******************************************************************************/
#[allow(non_snake_case)] #[allow(non_snake_case)]
unsafe fn is_file_size_okay(msg: *const dc_msg_t) -> libc::c_int { unsafe fn is_file_size_okay(msg: *const dc_msg_t) -> bool {
let mut file_size_okay = 1; let mut file_size_okay = true;
let pathNfilename = to_cstring((*msg).param.get(Param::File).unwrap_or_default()); let pathNfilename = to_cstring((*msg).param.get(Param::File).unwrap_or_default());
let bytes = dc_get_filebytes((*msg).context, pathNfilename); let bytes = dc_get_filebytes((*msg).context, pathNfilename);
if bytes > (49 * 1024 * 1024 / 4 * 3) { if bytes > (49 * 1024 * 1024 / 4 * 3) {
file_size_okay = 0; file_size_okay = false;
} }
free(pathNfilename as *mut _); free(pathNfilename as *mut _);