ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-24 05:01:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

kdb: Rename struct defcmd_set to struct kdb_macro

Browse Source 
Rename struct defcmd_set to struct kdb_macro as that sounds more
appropriate given its purpose.

Suggested-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20210712134620.276667-2-sumit.garg@linaro.org
Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
This commit is contained in:
Sumit Garg
2021-07-12 19:16:17 +05:30
committed by Daniel Thompson
parent 95f7f15461
commit b39cded834
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
kernel/debug/kdb/kdb_main.c
View File

@@ -654,7 +654,7 @@ static void kdb_cmderror(int diag)
* Returns: * Returns:
* zero for success, a kdb diagnostic if error * zero for success, a kdb diagnostic if error
*/ */
struct defcmd_set { struct kdb_macro {
int count; int count;
bool usable; bool usable;
char *name; char *name;
@@ -662,8 +662,8 @@ struct defcmd_set {
char *help; char *help;
char **command; char **command;
}; };
static struct defcmd_set *defcmd_set; static struct kdb_macro *kdb_macro;
static int defcmd_set_count; static int kdb_macro_count;
static bool defcmd_in_progress; static bool defcmd_in_progress;
/* Forward references */ /* Forward references */
@@ -671,7 +671,7 @@ static int kdb_exec_defcmd(int argc, const char **argv);
static int kdb_defcmd2(const char *cmdstr, const char *argv0) static int kdb_defcmd2(const char *cmdstr, const char *argv0)
{ {
struct defcmd_set *s = defcmd_set + defcmd_set_count - 1; struct kdb_macro *s = kdb_macro + kdb_macro_count - 1;
char **save_command = s->command; char **save_command = s->command;
if (strcmp(argv0, "endefcmd") == 0) { if (strcmp(argv0, "endefcmd") == 0) {
defcmd_in_progress = false; defcmd_in_progress = false;
@@ -704,7 +704,7 @@ static int kdb_defcmd2(const char *cmdstr, const char *argv0)
static int kdb_defcmd(int argc, const char **argv) static int kdb_defcmd(int argc, const char **argv)
{ {
struct defcmd_set *save_defcmd_set = defcmd_set, *s; struct kdb_macro *save_kdb_macro = kdb_macro, *s;
if (defcmd_in_progress) { if (defcmd_in_progress) {
kdb_printf("kdb: nested defcmd detected, assuming missing " kdb_printf("kdb: nested defcmd detected, assuming missing "
"endefcmd\n"); "endefcmd\n");
@@ -712,7 +712,7 @@ static int kdb_defcmd(int argc, const char **argv)
} }
if (argc == 0) { if (argc == 0) {
int i; int i;
for (s = defcmd_set; s < defcmd_set + defcmd_set_count; ++s) { for (s = kdb_macro; s < kdb_macro + kdb_macro_count; ++s) {
kdb_printf("defcmd %s \"%s\" \"%s\"\n", s->name, kdb_printf("defcmd %s \"%s\" \"%s\"\n", s->name,
s->usage, s->help); s->usage, s->help);
for (i = 0; i < s->count; ++i) for (i = 0; i < s->count; ++i)
@@ -727,13 +727,13 @@ static int kdb_defcmd(int argc, const char **argv)
kdb_printf("Command only available during kdb_init()\n"); kdb_printf("Command only available during kdb_init()\n");
return KDB_NOTIMP; return KDB_NOTIMP;
} }
defcmd_set = kmalloc_array(defcmd_set_count + 1, sizeof(*defcmd_set), kdb_macro = kmalloc_array(kdb_macro_count + 1, sizeof(*kdb_macro),
GFP_KDB); GFP_KDB);
if (!defcmd_set) if (!kdb_macro)
goto fail_defcmd; goto fail_defcmd;
memcpy(defcmd_set, save_defcmd_set, memcpy(kdb_macro, save_kdb_macro,
defcmd_set_count * sizeof(*defcmd_set)); kdb_macro_count * sizeof(*kdb_macro));
s = defcmd_set + defcmd_set_count; s = kdb_macro + kdb_macro_count;
memset(s, 0, sizeof(*s)); memset(s, 0, sizeof(*s));
s->usable = true; s->usable = true;
s->name = kdb_strdup(argv[1], GFP_KDB); s->name = kdb_strdup(argv[1], GFP_KDB);
@@ -753,19 +753,19 @@ static int kdb_defcmd(int argc, const char **argv)
strcpy(s->help, argv[3]+1); strcpy(s->help, argv[3]+1);
s->help[strlen(s->help)-1] = '\0'; s->help[strlen(s->help)-1] = '\0';
} }
++defcmd_set_count; ++kdb_macro_count;
defcmd_in_progress = true; defcmd_in_progress = true;
kfree(save_defcmd_set); kfree(save_kdb_macro);
return 0; return 0;
fail_help: fail_help:
kfree(s->usage); kfree(s->usage);
fail_usage: fail_usage:
kfree(s->name); kfree(s->name);
fail_name: fail_name:
kfree(defcmd_set); kfree(kdb_macro);
fail_defcmd: fail_defcmd:
kdb_printf("Could not allocate new defcmd_set entry for %s\n", argv[1]); kdb_printf("Could not allocate new kdb_macro entry for %s\n", argv[1]);
defcmd_set = save_defcmd_set; kdb_macro = save_kdb_macro;
return KDB_NOTIMP; return KDB_NOTIMP;
} }
@@ -781,14 +781,14 @@ fail_defcmd:
static int kdb_exec_defcmd(int argc, const char **argv) static int kdb_exec_defcmd(int argc, const char **argv)
{ {
int i, ret; int i, ret;
struct defcmd_set *s; struct kdb_macro *s;
if (argc != 0) if (argc != 0)
return KDB_ARGCOUNT; return KDB_ARGCOUNT;
for (s = defcmd_set, i = 0; i < defcmd_set_count; ++i, ++s) { for (s = kdb_macro, i = 0; i < kdb_macro_count; ++i, ++s) {
if (strcmp(s->name, argv[0]) == 0) if (strcmp(s->name, argv[0]) == 0)
break; break;
} }
if (i == defcmd_set_count) { if (i == kdb_macro_count) {
kdb_printf("kdb_exec_defcmd: could not find commands for %s\n", kdb_printf("kdb_exec_defcmd: could not find commands for %s\n",
argv[0]); argv[0]);
return KDB_NOTIMP; return KDB_NOTIMP;