Kill to_cstring with fire

I swear I already did this, see #273.
This commit is contained in:
Floris Bruynooghe
2019-08-04 00:14:49 +02:00
committed by Floris Bruynooghe
parent d814dffbb0
commit 0051720d1b
3 changed files with 7 additions and 13 deletions

View File

@@ -310,12 +310,12 @@ pub unsafe fn dc_open(context: &Context, dbfile: &str, blobdir: Option<&str>) ->
if 0 != dc_is_open(context) {
return false;
}
*context.dbfile.write().unwrap() = to_cstring(dbfile);
*context.dbfile.write().unwrap() = dbfile.strdup();
if blobdir.is_some() && blobdir.unwrap().len() > 0 {
let dir = to_cstring(dc_ensure_no_slash_safe(blobdir.unwrap()));
let dir = dc_ensure_no_slash_safe(blobdir.unwrap()).strdup();
*context.blobdir.write().unwrap() = dir;
} else {
let dir = to_cstring(dbfile.to_string() + "-blobs");
let dir = (dbfile.to_string() + "-blobs").strdup();
dc_create_folder(context, dir);
*context.blobdir.write().unwrap() = dir;
}