Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
graphics/rawstudio: revert/redo naive and bogus previous build "fix"
Newish Clang had actually revealed the problem with this old codebase which was not updated against context and logfile handling being done without varargs in modern libgphoto2 versions. Fixes: e9d1560
- Loading branch information
Alexey Dokuchaev
authored and
Alexey Dokuchaev
committed
Aug 7, 2023
1 parent
0731785
commit 5914253
Showing
2 changed files
with
34 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
--- src/rs-tethered-shooting.c.orig 2011-03-26 02:07:57 UTC | ||
+++ src/rs-tethered-shooting.c | ||
@@ -115,13 +115,12 @@ append_status(TetherInfo *t, const gchar *format, ...) | ||
} | ||
|
||
static void | ||
-ctx_error_func (GPContext *context, const char *format, va_list args, void *data) | ||
+ctx_error_func (GPContext *context, const char *str, void *data) | ||
{ | ||
gdk_threads_lock(); | ||
TetherInfo *t = (TetherInfo*)data; | ||
append_status (t, _("Gphoto2 reported Context Error:\n")); | ||
- append_status_va_list(t, format, args); | ||
- append_status (t, "\n"); | ||
+ append_status(t, "%s\n", str); | ||
if (t->async_thread_id && t->async_thread_id != g_thread_self()) | ||
shutdown_async_thread(t); | ||
t->keep_thread_running = FALSE; | ||
@@ -129,12 +128,11 @@ ctx_error_func (GPContext *context, const char *format | ||
} | ||
|
||
static void | ||
-ctx_status_func (GPContext *context, const char *format, va_list args, void *data) | ||
+ctx_status_func (GPContext *context, const char *str, void *data) | ||
{ | ||
TetherInfo *t = (TetherInfo*)data; | ||
gdk_threads_lock(); | ||
- append_status_va_list(t, format, args); | ||
- append_status (t, "\n"); | ||
+ append_status(t, "%s\n", str); | ||
gdk_threads_unlock(); | ||
} | ||
|