Skip to content

gtk.cfg: Remove extra semicolons from g_return* macros #8632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
correctmost wants to merge 1 commit into
base: main
Choose a base branch
from
+40 −4
Open

gtk.cfg: Remove extra semicolons from g_return* macros #8632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cfg/gtk.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<def format="2">
<define name="TRUE" value="(!FALSE)"/>
<define name="FALSE" value="(0)"/>
<define name="g_return_if_fail(expr)" value="do{if(!(expr)){return;}}while(0);"/>
<define name="g_return_val_if_fail(expr,val)" value="do{if(!(expr)){return (val);}}while(0);"/>
<define name="g_return_if_reached()" value="do{return;}while(0);"/>
<define name="g_return_val_if_reached(val)" value="do{return (val);}while(0);"/>
<define name="g_return_if_fail(expr)" value="do{if(!(expr)){return;}}while(0)"/>
<define name="g_return_val_if_fail(expr,val)" value="do{if(!(expr)){return (val);}}while(0)"/>
<define name="g_return_if_reached()" value="do{return;}while(0)"/>
<define name="g_return_val_if_reached(val)" value="do{return (val);}while(0)"/>
<define name="G_CALLBACK(cb)" value="cb"/>
<define name="GTK_SIGNAL_FUNC(f)" value="G_CALLBACK(f)"/>
<define name="G_DIR_SEPARATOR_S" value="&quot;/&quot;"/>
Expand Down
36 changes: 36 additions & 0 deletions test/cfg/gtk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,3 +596,39 @@ void gtk_widget_destroy_test() {
// cppcheck-suppress mismatchAllocDealloc
g_object_unref(widget);
}

void g_return_if_fail_test(const char *s) {
g_return_if_fail(s);

if (*s)
g_return_if_fail(*s == 'a');
else
g_info("Test the else branch can be parsed");
}

int g_return_val_if_fail_test(const char *s) {
g_return_val_if_fail(s, 1);

if (*s)
g_return_val_if_fail(*s == 'a', 1);
else
g_info("Test the else branch can be parsed");

return 0;
}

void g_return_if_reached_test(const char *s) {
if (s)
g_return_if_reached();
else
g_info("Test the else branch can be parsed");
}

int g_return_val_if_reached_test(const char *s) {
if (s)
g_return_val_if_reached(1);
else
g_info("Test the else branch can be parsed");

return 0;
}
Loading