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

remove lot magic

Browse Source
This commit is contained in:
Simon Laux
2019-08-12 00:53:16 +02:00
committed by holger krekel
parent 89c874d4a9
commit c713474d1f
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/dc_lot.rs
View File

@@ -11,7 +11,6 @@ use crate::x::*;
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
#[repr(C)] #[repr(C)]
pub struct dc_lot_t { pub struct dc_lot_t {
pub magic: uint32_t,
pub text1_meaning: libc::c_int, pub text1_meaning: libc::c_int,
pub text1: *mut libc::c_char, pub text1: *mut libc::c_char,
pub text2: *mut libc::c_char, pub text2: *mut libc::c_char,
@@ -38,14 +37,13 @@ pub unsafe fn dc_lot_new() -> *mut dc_lot_t {
lot = calloc(1, ::std::mem::size_of::<dc_lot_t>()) as *mut dc_lot_t; lot = calloc(1, ::std::mem::size_of::<dc_lot_t>()) as *mut dc_lot_t;
assert!(!lot.is_null()); assert!(!lot.is_null());
(*lot).magic = 0x107107i32 as uint32_t;
(*lot).text1_meaning = 0i32; (*lot).text1_meaning = 0i32;
lot lot
} }
pub unsafe fn dc_lot_empty(mut lot: *mut dc_lot_t) { pub unsafe fn dc_lot_empty(mut lot: *mut dc_lot_t) {
if lot.is_null() || (*lot).magic != 0x107107i32 as libc::c_uint { if lot.is_null() {
return; return;
} }
free((*lot).text1 as *mut libc::c_void); free((*lot).text1 as *mut libc::c_void);
@@ -64,17 +62,16 @@ pub unsafe fn dc_lot_empty(mut lot: *mut dc_lot_t) {
(*lot).id = 0i32 as uint32_t; (*lot).id = 0i32 as uint32_t;
} }
pub unsafe fn dc_lot_unref(mut set: *mut dc_lot_t) { pub unsafe fn dc_lot_unref(set: *mut dc_lot_t) {
if set.is_null() || (*set).magic != 0x107107i32 as libc::c_uint { if set.is_null() {
return; return;
} }
dc_lot_empty(set); dc_lot_empty(set);
(*set).magic = 0i32 as uint32_t;
free(set as *mut libc::c_void); free(set as *mut libc::c_void);
} }
pub unsafe fn dc_lot_get_text1(lot: *const dc_lot_t) -> *mut libc::c_char { pub unsafe fn dc_lot_get_text1(lot: *const dc_lot_t) -> *mut libc::c_char {
if lot.is_null() || (*lot).magic != 0x107107i32 as libc::c_uint { if lot.is_null() {
return 0 as *mut libc::c_char; return 0 as *mut libc::c_char;
} }
@@ -82,7 +79,7 @@ pub unsafe fn dc_lot_get_text1(lot: *const dc_lot_t) -> *mut libc::c_char {
} }
pub unsafe fn dc_lot_get_text2(lot: *const dc_lot_t) -> *mut libc::c_char { pub unsafe fn dc_lot_get_text2(lot: *const dc_lot_t) -> *mut libc::c_char {
if lot.is_null() || (*lot).magic != 0x107107i32 as libc::c_uint { if lot.is_null() {
return 0 as *mut libc::c_char; return 0 as *mut libc::c_char;
} }
@@ -90,7 +87,7 @@ pub unsafe fn dc_lot_get_text2(lot: *const dc_lot_t) -> *mut libc::c_char {
} }
pub unsafe fn dc_lot_get_text1_meaning(lot: *const dc_lot_t) -> libc::c_int { pub unsafe fn dc_lot_get_text1_meaning(lot: *const dc_lot_t) -> libc::c_int {
if lot.is_null() || (*lot).magic != 0x107107i32 as libc::c_uint { if lot.is_null() {
return 0i32; return 0i32;
} }
@@ -98,7 +95,7 @@ pub unsafe fn dc_lot_get_text1_meaning(lot: *const dc_lot_t) -> libc::c_int {
} }
pub unsafe fn dc_lot_get_state(lot: *const dc_lot_t) -> libc::c_int { pub unsafe fn dc_lot_get_state(lot: *const dc_lot_t) -> libc::c_int {
if lot.is_null() || (*lot).magic != 0x107107i32 as libc::c_uint { if lot.is_null() {
return 0i32; return 0i32;
} }
@@ -106,7 +103,7 @@ pub unsafe fn dc_lot_get_state(lot: *const dc_lot_t) -> libc::c_int {
} }
pub unsafe fn dc_lot_get_id(lot: *const dc_lot_t) -> uint32_t { pub unsafe fn dc_lot_get_id(lot: *const dc_lot_t) -> uint32_t {
if lot.is_null() || (*lot).magic != 0x107107i32 as libc::c_uint { if lot.is_null() {
return 0i32 as uint32_t; return 0i32 as uint32_t;
} }
@@ -114,7 +111,7 @@ pub unsafe fn dc_lot_get_id(lot: *const dc_lot_t) -> uint32_t {
} }
pub unsafe fn dc_lot_get_timestamp(lot: *const dc_lot_t) -> i64 { pub unsafe fn dc_lot_get_timestamp(lot: *const dc_lot_t) -> i64 {
if lot.is_null() || (*lot).magic != 0x107107i32 as libc::c_uint { if lot.is_null() {
return 0; return 0;
} }
@@ -130,7 +127,7 @@ pub unsafe fn dc_lot_fill(
contact: Option<&Contact>, contact: Option<&Contact>,
context: &Context, context: &Context,
) { ) {
if lot.is_null() || (*lot).magic != 0x107107i32 as libc::c_uint || msg.is_null() { if lot.is_null() || msg.is_null() {
return; return;
} }
if (*msg).state == 19i32 { if (*msg).state == 19i32 {