DeforaOS/Coder
DeforaOS/Coder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt to the new API for the Error class

Browse Source
This commit is contained in:
Pierre Pronchery 2015-11-24 00:29:15 +01:00
parent 0fbd920e62
commit 7aa23272c3
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/coder.c
View File

@ -353,12 +353,12 @@ int coder_project_open(Coder * coder, char const * filename)
Project * project;
if((project = project_new()) == NULL)
return -coder_error(coder, error_get(), 1);
return -coder_error(coder, error_get(NULL), 1);
if(project_load(project, filename) != 0
|| coder_project_open_project(coder, project) != 0)
{
project_delete(project);
return -coder_error(coder, error_get(), 1);
return -coder_error(coder, error_get(NULL), 1);
}
coder->cur = project;
#if GTK_CHECK_VERSION(2, 24, 0)

4
tools/debug/ptrace.c
View File

@ -256,7 +256,7 @@ static void _start_on_child_watch(GPid pid, gint status, gpointer data)
error_set_code(WEXITSTATUS(status), "%s", error->message);
g_error_free(error);
debug->helper->error(debug->helper->debugger,
WEXITSTATUS(status), "%s", error_get(),
WEXITSTATUS(status), "%s", error_get(NULL),
}
debug->source = 0;
_ptrace_exit(debug);
@ -377,7 +377,7 @@ static int _ptrace_request(PtraceDebug * debug, int request, void * addr,
if(errno == ESRCH)
_ptrace_exit(debug);
return -debug->helper->error(debug->helper->debugger, 1,
"%s", error_get());
"%s", error_get(NULL));
}
debug->running = TRUE;
return 0;

6
tools/debugger.c
View File

@ -614,7 +614,7 @@ int debugger_open(Debugger * debugger, char const * arch, char const * format,
if(filename == NULL)
return debugger_open_dialog(debugger, arch, format);
if(debugger_close(debugger) != 0)
return -debugger_error(debugger, error_get(), 1);
return -debugger_error(debugger, error_get(NULL), 1);
if((debugger->filename = string_new(filename)) == NULL)
return -1;
if(debugger->bdefinition->open(debugger->backend, arch, format,
@ -622,7 +622,7 @@ int debugger_open(Debugger * debugger, char const * arch, char const * format,
{
string_delete(debugger->filename);
debugger->filename = NULL;
return -debugger_error(debugger, error_get(), 1);
return -debugger_error(debugger, error_get(NULL), 1);
}
if((s = string_new_append(_("Debugger"), " - ", filename, NULL))
!= NULL)
@ -650,7 +650,7 @@ int debugger_open_dialog(Debugger * debugger, char const * arch,
if(debugger_close(debugger) != 0)
{
free(filename);
return -debugger_error(debugger, error_get(), 1);
return -debugger_error(debugger, error_get(NULL), 1);
}
ret = debugger_open(debugger, arch, format, filename);
free(filename);

16
tools/gdeasm.c
View File

@ -363,11 +363,11 @@ int gdeasm_load_comments(GDeasm * gdeasm, char const * filename)
fprintf(stderr, "DEBUG: %s(\"%s\")\n", __func__, filename);
#endif
if((config = config_new()) == NULL)
return -_gdeasm_error(gdeasm, error_get(), 1);
return -_gdeasm_error(gdeasm, error_get(NULL), 1);
if(config_load(config, filename) != 0)
{
config_delete(config);
return -_gdeasm_error(gdeasm, error_get(), 1);
return -_gdeasm_error(gdeasm, error_get(NULL), 1);
}
for(valid = gtk_tree_model_get_iter_first(model, &parent); valid;
valid = gtk_tree_model_iter_next(model, &parent))
@ -474,7 +474,7 @@ int gdeasm_open(GDeasm * gdeasm, char const * arch, char const * format,
return 0;
}
if((a = asm_new(arch, format)) == NULL)
return -_gdeasm_error(gdeasm, error_get(), 1);
return -_gdeasm_error(gdeasm, error_get(NULL), 1);
_gdeasm_set_status(gdeasm, "");
if((code = asm_open_deassemble(a, filename, TRUE)) != NULL)
{
@ -491,7 +491,7 @@ int gdeasm_open(GDeasm * gdeasm, char const * arch, char const * format,
}
asm_delete(a);
if(ret != 0)
_gdeasm_error(gdeasm, error_get(), 1);
_gdeasm_error(gdeasm, error_get(NULL), 1);
return ret;
}
@ -881,7 +881,7 @@ int gdeasm_save_comments(GDeasm * gdeasm, char const * filename)
args.ret = 0;
args.gdeasm = gdeasm;
if((args.config = config_new()) == NULL)
return -_gdeasm_error(gdeasm, error_get(), 1);
return -_gdeasm_error(gdeasm, error_get(NULL), 1);
gtk_tree_model_foreach(GTK_TREE_MODEL(gdeasm->asm_store),
_save_comments_foreach, &args);
if(args.ret == 0)
@ -889,7 +889,7 @@ int gdeasm_save_comments(GDeasm * gdeasm, char const * filename)
if(config_save(args.config, filename) == 0)
gdeasm->modified = FALSE;
else
args.ret = -_gdeasm_error(gdeasm, error_get(), 1);
args.ret = -_gdeasm_error(gdeasm, error_get(NULL), 1);
}
config_delete(args.config);
return args.ret;
@ -909,8 +909,8 @@ static gboolean _save_comments_foreach(GtkTreeModel * model, GtkTreePath * path,
{
snprintf(buf, sizeof(buf), "0x%x", offset);
if(config_set(args->config, "comments", buf, p) != 0)
args->ret = -_gdeasm_error(args->gdeasm, error_get(),
1);
args->ret = -_gdeasm_error(args->gdeasm,
error_get(NULL), 1);
}
g_free(p);
return (args->ret == 0) ? FALSE : TRUE;

4
tools/sequel.c
View File

@ -551,7 +551,7 @@ static int _sequel_connect(Sequel * sequel, char const * engine,
sequel->database = database_new(engine, config, section);
if(sequel->database == NULL)
{
sequel_error(sequel, error_get(), 1);
sequel_error(sequel, error_get(NULL), 1);
gtk_widget_set_sensitive(GTK_WIDGET(_sequel_toolbar[4].widget),
FALSE);
}
@ -816,7 +816,7 @@ static int _sequel_execute(Sequel * sequel)
gtk_widget_set_sensitive(GTK_WIDGET(_sequel_toolbar[8].widget),
(sequel->tabs[i].store != NULL) ? TRUE : FALSE);
if(res != 0)
return -sequel_error(sequel, error_get(), 1);
return -sequel_error(sequel, error_get(NULL), 1);
return 0;
}