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

Remove useless argument to quote_word

Browse Source 
Function "quote_word" accepts display charset argument, but on only call
site it is string constant. Change function to always use "utf-8"
display charset, and remove useless argument.
This commit is contained in:
Dmitry Bogatov
2019-09-21 22:20:56 +00:00
parent 05f9f454c3
commit 9ba57a923b
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/dc_strencode.rs
View File

@@ -65,7 +65,6 @@ pub unsafe fn dc_encode_header_words(to_encode_r: impl AsRef<str>) -> *mut libc:
} }
if 0 != quote_words { if 0 != quote_words {
if !quote_word( if !quote_word(
b"utf-8\x00" as *const u8 as *const libc::c_char,
mmapstr, mmapstr,
begin, begin,
end.wrapping_offset_from(begin) as libc::size_t, end.wrapping_offset_from(begin) as libc::size_t,
@@ -121,7 +120,6 @@ pub unsafe fn dc_encode_header_words(to_encode_r: impl AsRef<str>) -> *mut libc:
} }
unsafe fn quote_word( unsafe fn quote_word(
display_charset: *const libc::c_char,
mmapstr: *mut MMAPString, mmapstr: *mut MMAPString,
word: *const libc::c_char, word: *const libc::c_char,
size: libc::size_t, size: libc::size_t,
@@ -130,15 +128,10 @@ unsafe fn quote_word(
let mut i = 0; let mut i = 0;
let mut hex: [libc::c_char; 4] = [0; 4]; let mut hex: [libc::c_char; 4] = [0; 4];
// let mut col: libc::c_int = 0i32; // let mut col: libc::c_int = 0i32;
if mmap_string_append(mmapstr, b"=?\x00" as *const u8 as *const libc::c_char).is_null() { if mmap_string_append(mmapstr, b"=?utf-8?Q?\x00".as_ptr().cast()).is_null() {
return false;
}
if mmap_string_append(mmapstr, display_charset).is_null() {
return false;
}
if mmap_string_append(mmapstr, b"?Q?\x00" as *const u8 as *const libc::c_char).is_null() {
return false; return false;
} }
// col = (*mmapstr).len as libc::c_int; // col = (*mmapstr).len as libc::c_int;
cur = word; cur = word;
while i < size { while i < size {