[Bf-blender-cvs] [548b3516479] master: Cleanup: use snake case for BLI_args API
Campbell Barton
noreply at git.blender.org
Fri Nov 6 02:41:45 CET 2020
Commit: 548b3516479b478653b4eb074bbdcea535c4071f
Author: Campbell Barton
Date: Fri Nov 6 10:29:06 2020 +1100
Branches: master
https://developer.blender.org/rB548b3516479b478653b4eb074bbdcea535c4071f
Cleanup: use snake case for BLI_args API
===================================================================
M source/blender/blenlib/BLI_args.h
M source/blender/blenlib/intern/BLI_args.c
M source/creator/creator.c
M source/creator/creator_args.c
===================================================================
diff --git a/source/blender/blenlib/BLI_args.h b/source/blender/blenlib/BLI_args.h
index ebf88ea69f5..b12b7ff5d1e 100644
--- a/source/blender/blenlib/BLI_args.h
+++ b/source/blender/blenlib/BLI_args.h
@@ -38,41 +38,41 @@ typedef struct bArgs bArgs;
*/
typedef int (*BA_ArgCallback)(int argc, const char **argv, void *data);
-struct bArgs *BLI_argsInit(int argc, const char **argv);
-void BLI_argsFree(struct bArgs *ba);
+struct bArgs *BLI_args_create(int argc, const char **argv);
+void BLI_args_destroy(struct bArgs *ba);
-/** The pass to use for #BLI_argsAdd. */
-void BLI_argsPassSet(struct bArgs *ba, int current_pass);
+/** The pass to use for #BLI_args_add. */
+void BLI_args_pass_set(struct bArgs *ba, int current_pass);
/**
* Pass starts at 1, -1 means valid all the time
* short_arg or long_arg can be null to specify no short or long versions
*/
-void BLI_argsAdd(struct bArgs *ba,
- const char *short_arg,
- const char *long_arg,
- const char *doc,
- BA_ArgCallback cb,
- void *data);
+void BLI_args_add(struct bArgs *ba,
+ const char *short_arg,
+ const char *long_arg,
+ const char *doc,
+ BA_ArgCallback cb,
+ void *data);
/**
* Short_case and long_case specify if those arguments are case specific
*/
-void BLI_argsAddCase(struct bArgs *ba,
- const char *short_arg,
- int short_case,
- const char *long_arg,
- int long_case,
- const char *doc,
- BA_ArgCallback cb,
- void *data);
+void BLI_args_add_case(struct bArgs *ba,
+ const char *short_arg,
+ int short_case,
+ const char *long_arg,
+ int long_case,
+ const char *doc,
+ BA_ArgCallback cb,
+ void *data);
-void BLI_argsParse(struct bArgs *ba, int pass, BA_ArgCallback default_cb, void *data);
+void BLI_args_parse(struct bArgs *ba, int pass, BA_ArgCallback default_cb, void *data);
-void BLI_argsPrintArgDoc(struct bArgs *ba, const char *arg);
-void BLI_argsPrintOtherDoc(struct bArgs *ba);
+void BLI_args_print_arg_doc(struct bArgs *ba, const char *arg);
+void BLI_args_print_other_doc(struct bArgs *ba);
-void BLI_argsPrint(struct bArgs *ba);
+void BLI_args_print(struct bArgs *ba);
#ifdef __cplusplus
}
diff --git a/source/blender/blenlib/intern/BLI_args.c b/source/blender/blenlib/intern/BLI_args.c
index 2f1571d4ea1..3d4521a3304 100644
--- a/source/blender/blenlib/intern/BLI_args.c
+++ b/source/blender/blenlib/intern/BLI_args.c
@@ -111,7 +111,7 @@ static bArgument *lookUp(struct bArgs *ba, const char *arg, int pass, int case_s
return BLI_ghash_lookup(ba->items, &key);
}
-bArgs *BLI_argsInit(int argc, const char **argv)
+bArgs *BLI_args_create(int argc, const char **argv)
{
bArgs *ba = MEM_callocN(sizeof(bArgs), "bArgs");
ba->passes = MEM_callocN(sizeof(int) * argc, "bArgs passes");
@@ -120,13 +120,13 @@ bArgs *BLI_argsInit(int argc, const char **argv)
ba->argc = argc;
ba->argv = argv;
- /* Must be initialized by #BLI_argsPassSet. */
+ /* Must be initialized by #BLI_args_pass_set. */
ba->current_pass = 0;
return ba;
}
-void BLI_argsFree(struct bArgs *ba)
+void BLI_args_destroy(struct bArgs *ba)
{
BLI_ghash_free(ba->items, MEM_freeN, MEM_freeN);
MEM_freeN(ba->passes);
@@ -134,13 +134,13 @@ void BLI_argsFree(struct bArgs *ba)
MEM_freeN(ba);
}
-void BLI_argsPassSet(struct bArgs *ba, int current_pass)
+void BLI_args_pass_set(struct bArgs *ba, int current_pass)
{
BLI_assert((current_pass != 0) && (current_pass >= -1));
ba->current_pass = current_pass;
}
-void BLI_argsPrint(struct bArgs *ba)
+void BLI_args_print(struct bArgs *ba)
{
int i;
for (i = 0; i < ba->argc; i++) {
@@ -206,14 +206,14 @@ static void internalAdd(
BLI_ghash_insert(ba->items, key, a);
}
-void BLI_argsAddCase(struct bArgs *ba,
- const char *short_arg,
- int short_case,
- const char *long_arg,
- int long_case,
- const char *doc,
- BA_ArgCallback cb,
- void *data)
+void BLI_args_add_case(struct bArgs *ba,
+ const char *short_arg,
+ int short_case,
+ const char *long_arg,
+ int long_case,
+ const char *doc,
+ BA_ArgCallback cb,
+ void *data)
{
bArgDoc *d = internalDocs(ba, short_arg, long_arg, doc);
@@ -226,14 +226,14 @@ void BLI_argsAddCase(struct bArgs *ba,
}
}
-void BLI_argsAdd(struct bArgs *ba,
- const char *short_arg,
- const char *long_arg,
- const char *doc,
- BA_ArgCallback cb,
- void *data)
+void BLI_args_add(struct bArgs *ba,
+ const char *short_arg,
+ const char *long_arg,
+ const char *doc,
+ BA_ArgCallback cb,
+ void *data)
{
- BLI_argsAddCase(ba, short_arg, 0, long_arg, 0, doc, cb, data);
+ BLI_args_add_case(ba, short_arg, 0, long_arg, 0, doc, cb, data);
}
static void internalDocPrint(bArgDoc *d)
@@ -251,7 +251,7 @@ static void internalDocPrint(bArgDoc *d)
printf(" %s\n\n", d->documentation);
}
-void BLI_argsPrintArgDoc(struct bArgs *ba, const char *arg)
+void BLI_args_print_arg_doc(struct bArgs *ba, const char *arg)
{
bArgument *a = lookUp(ba, arg, -1, -1);
@@ -264,7 +264,7 @@ void BLI_argsPrintArgDoc(struct bArgs *ba, const char *arg)
}
}
-void BLI_argsPrintOtherDoc(struct bArgs *ba)
+void BLI_args_print_other_doc(struct bArgs *ba)
{
bArgDoc *d;
@@ -275,7 +275,7 @@ void BLI_argsPrintOtherDoc(struct bArgs *ba)
}
}
-void BLI_argsParse(struct bArgs *ba, int pass, BA_ArgCallback default_cb, void *default_data)
+void BLI_args_parse(struct bArgs *ba, int pass, BA_ArgCallback default_cb, void *default_data)
{
BLI_assert((pass != 0) && (pass >= -1));
int i = 0;
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 738b49dff84..8b64ca01650 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -163,7 +163,7 @@ static void callback_main_atexit(void *user_data)
struct CreatorAtExitData *app_init_data = user_data;
if (app_init_data->ba) {
- BLI_argsFree(app_init_data->ba);
+ BLI_args_destroy(app_init_data->ba);
app_init_data->ba = NULL;
}
@@ -392,7 +392,7 @@ int main(int argc,
/* First test for background-mode (#Global.background) */
#ifndef WITH_PYTHON_MODULE
- ba = BLI_argsInit(argc, (const char **)argv); /* skip binary path */
+ ba = BLI_args_create(argc, (const char **)argv); /* skip binary path */
/* Ensure we free on early exit. */
app_init_data.ba = ba;
@@ -404,7 +404,7 @@ int main(int argc,
MEM_use_memleak_detection(false);
/* Parse environment handling arguments. */
- BLI_argsParse(ba, ARG_PASS_ENVIRONMENT, NULL, NULL);
+ BLI_args_parse(ba, ARG_PASS_ENVIRONMENT, NULL, NULL);
#else
/* Using preferences or user startup makes no sense for #WITH_PYTHON_MODULE. */
@@ -423,7 +423,7 @@ int main(int argc,
#ifndef WITH_PYTHON_MODULE
/* First test for background-mode (#Global.background) */
- BLI_argsParse(ba, ARG_PASS_SETTINGS, NULL, NULL);
+ BLI_args_parse(ba, ARG_PASS_SETTINGS, NULL, NULL);
main_signal_setup();
#endif
@@ -461,9 +461,9 @@ int main(int argc,
#ifndef WITH_PYTHON_MODULE
if (G.background == 0) {
- BLI_argsParse(ba, ARG_PASS_SETTINGS_GUI, NULL, NULL);
+ BLI_args_parse(ba, ARG_PASS_SETTINGS_GUI, NULL, NULL);
}
- BLI_argsParse(ba, ARG_PASS_SETTINGS_FORCE, NULL, NULL);
+ BLI_args_parse(ba, ARG_PASS_SETTINGS_FORCE, NULL, NULL);
#endif
WM_init(C, argc, (const char **)argv);
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index a36bdbf8a87..2eae8d4074d 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -517,128 +517,128 @@ static int arg_handle_print_help(int UNUSED(argc), const char **UNUSED(argv), vo
printf("Usage: blender [args ...] [file] [args ...]\n\n");
printf("Render Options:\n");
- BLI_argsPrintArgDoc(ba, "--background");
- BLI_argsPrintArgDoc(ba, "--render-anim");
- BLI_argsPrintArgDoc(ba, "--scene");
- BLI_argsPrintArgDoc(ba, "--render-frame");
- BLI_argsPrintArgDoc(ba, "--frame-start");
- BLI_argsPrintArgDoc(ba, "--frame-end");
- BLI_argsPrintArgDoc(ba, "--frame-jump");
- BLI_argsPrintArgDoc(ba, "--render-output");
- BLI_argsPrintArgDoc(ba, "--engine");
- BLI_argsPrintArgDoc(ba, "--threads");
+ BLI_args_print_arg_doc(ba, "--background");
+ BLI_args_print_arg_doc(ba, "--render-anim");
+ BLI_args_print_arg_doc(ba, "--scene");
+ BLI_args_print_arg_doc(ba, "--render-frame");
+ BLI_args_print_arg_doc(ba, "--frame-start");
+ BLI_args_print_arg_doc(ba, "--frame-end");
+ BLI_args_print_arg_doc(ba, "--frame-jump");
+ BLI_args_print_arg_doc(ba, "--render-output");
+ BLI_args_print_arg_doc(ba, "--engine");
+ BLI_args_print_arg_doc(ba, "--threads");
printf("\n");
printf("Format Options:\n");
- BLI_argsPrintArgDoc(ba, "--render-format");
- BLI_argsPrintArgDoc(ba, "--use-extension");
+ BLI_args_print_arg_doc(ba, "--render-format");
+ BLI_args_print_arg_doc(ba, "--use-extension");
printf("\n");
printf("Animation Playback Options:\n");
- BLI_argsPrintArgDoc(ba, "-a");
+ BLI_args_print_arg_doc(ba, "-a");
printf("\n");
printf("Window Options:\n");
- BLI_argsPrintArgDoc(ba, "--window-border");
- BLI_argsPrintArgDoc(ba, "--window-fullscreen");
- BLI_argsPrintArgDoc(ba, "--window-geometry");
- BLI_argsPrintArgDoc(ba, "--window-maximized");
- BLI_argsPrintArgDoc(ba, "--start-console");
- BLI_argsPrintArgDoc(ba, "--no-native-pixels");
- BLI_argsPrintArgDoc(ba, "--no-window-focus");
+ BLI_args_print_arg_doc(ba, "--window-border");
+ BLI_args_print
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list