projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
efi_loader: selftest: enable APPEND_WRITE tests
[oweals/u-boot.git]
/
env
/
callback.c
diff --git
a/env/callback.c
b/env/callback.c
index be70980f04e46c8efac81a6dbbbdaba7a1f8abfe..f0904cfdc5352249376d2fcc0a0eb2c83bb5b633 100644
(file)
--- a/
env/callback.c
+++ b/
env/callback.c
@@
-1,12
+1,12
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2012
* Joe Hershberger, National Instruments, joe.hershberger@ni.com
/*
* (C) Copyright 2012
* Joe Hershberger, National Instruments, joe.hershberger@ni.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
-#include <environment.h>
+#include <env.h>
+#include <env_internal.h>
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
DECLARE_GLOBAL_DATA_PTR;
@@
-43,7
+43,7
@@
static const char *callback_list;
* This is called specifically when the variable did not exist in the hash
* previously, so the blanket update did not find this variable.
*/
* This is called specifically when the variable did not exist in the hash
* previously, so the blanket update did not find this variable.
*/
-void env_callback_init(
ENTRY
*var_entry)
+void env_callback_init(
struct env_entry
*var_entry)
{
const char *var_name = var_entry->key;
char callback_name[256] = "";
{
const char *var_name = var_entry->key;
char callback_name[256] = "";
@@
-80,7
+80,7
@@
void env_callback_init(ENTRY *var_entry)
* Called on each existing env var prior to the blanket update since removing
* a callback association should remove its callback.
*/
* Called on each existing env var prior to the blanket update since removing
* a callback association should remove its callback.
*/
-static int clear_callback(
ENTRY
*entry)
+static int clear_callback(
struct env_entry
*entry)
{
entry->callback = NULL;
{
entry->callback = NULL;
@@
-92,13
+92,13
@@
static int clear_callback(ENTRY *entry)
*/
static int set_callback(const char *name, const char *value, void *priv)
{
*/
static int set_callback(const char *name, const char *value, void *priv)
{
-
ENTRY
e, *ep;
+
struct env_entry
e, *ep;
struct env_clbk_tbl *clbkp;
e.key = name;
e.data = NULL;
e.callback = NULL;
struct env_clbk_tbl *clbkp;
e.key = name;
e.data = NULL;
e.callback = NULL;
- hsearch_r(e, FIND, &ep, &env_htab, 0);
+ hsearch_r(e,
ENV_
FIND, &ep, &env_htab, 0);
/* does the env variable actually exist? */
if (ep != NULL) {
/* does the env variable actually exist? */
if (ep != NULL) {