mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-11 03:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix and simplify get_file_name

Browse source 
This function created a QFile that it didn't need and it returned a
dangling pointer (the std::string object was destroyed at the end of the
function).

The function now returns a pointer that the caller must free. For that
reason, it's easier in copy_image_and_overwrite to just go for the
QFileInfo call.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Thiago Macieira 2014-08-17 10:42:47 -07:00 committed by Dirk Hohndel
parent 29f50c6aee
commit f3d44db512
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
qthelper.cpp
View file

@ -284,19 +284,17 @@ picture_load_exit:
return; return;
} }
extern "C" const char* get_file_name(const char *fileName) extern "C" char *get_file_name(const char *fileName)
{ {
QFile file(fileName); QFileInfo fileInfo(fileName);
QFileInfo fileInfo(file.fileName()); return strdup(fileInfo.fileName().toUtf8());
QString filename(fileInfo.fileName());
return filename.toStdString().c_str();
} }
extern "C" void copy_image_and_overwrite(const char *cfileName, const char *cnewName) extern "C" void copy_image_and_overwrite(const char *cfileName, const char *cnewName)
{ {
QString fileName = QString::fromUtf8(cfileName); QString fileName = QString::fromUtf8(cfileName);
QString newName = QString::fromUtf8(cnewName); QString newName = QString::fromUtf8(cnewName);
newName += get_file_name(cfileName); newName += QFileInfo(cfileName).fileName();
QFile file(newName); QFile file(newName);
if (file.exists()) if (file.exists())
file.remove(); file.remove();

4
save-html.c
View file

@ -16,7 +16,9 @@ void save_photos(struct membuffer *b, const char *photos_dir, struct dive *dive)
struct picture *pic = dive->picture_list; struct picture *pic = dive->picture_list;
put_string(b, "\"photos\":["); put_string(b, "\"photos\":[");
while (pic) { while (pic) {
put_format(b, "{\"filename\":\"%s\"},", get_file_name(pic->filename)); char *fname = get_file_name(pic->filename);
put_format(b, "{\"filename\":\"%s\"},", fname);
free(fname);
copy_image_and_overwrite(pic->filename, photos_dir); copy_image_and_overwrite(pic->filename, photos_dir);
pic = pic->next; pic = pic->next;
} }

2
save-html.h
View file

@ -19,7 +19,7 @@ void export_HTML(const char *file_name, const char *photos_dir, const bool selec
void export_translation(const char *file_name); void export_translation(const char *file_name);
extern void copy_image_and_overwrite(const char *cfileName, const char *cnewName); extern void copy_image_and_overwrite(const char *cfileName, const char *cnewName);
extern const char *get_file_name(const char *fileName); extern char *get_file_name(const char *fileName);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif