dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 17:22:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

env: Drop the double underscores in search.h

Browse Source 
There doesn't seem to be any good reason for using __ in the arguments in
this header file. A double underscore is usually reserved for compiler
features.

Drop these and remove the unnecessary 'extern' as well.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Simon Glass
2019-08-01 09:47:10 -06:00
committed by Tom Rini
parent 3f0d680745
commit cb2ba9db5f
1 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
include/search.h
View File

@@ -17,7 +17,7 @@
#include <env.h> #include <env.h>
#include <stddef.h> #include <stddef.h>
#define __set_errno(val) do { errno = val; } while (0) #define set_errno(val) do { errno = val; } while (0)
/* enum env_action: action which shall be performed in the call to hsearch */ /* enum env_action: action which shall be performed in the call to hsearch */
enum env_action { enum env_action {
@@ -47,58 +47,54 @@ struct hsearch_data {
unsigned int filled; unsigned int filled;
/* /*
* Callback function which will check whether the given change for variable * Callback function which will check whether the given change for variable
* "__item" to "newval" may be applied or not, and possibly apply such change. * "item" to "newval" may be applied or not, and possibly apply such change.
* When (flag & H_FORCE) is set, it shall not print out any error message and * When (flag & H_FORCE) is set, it shall not print out any error message and
* shall force overwriting of write-once variables. * shall force overwriting of write-once variables.
* Must return 0 for approval, 1 for denial. * Must return 0 for approval, 1 for denial.
*/ */
int (*change_ok)(const struct env_entry *__item, const char *newval, int (*change_ok)(const struct env_entry *item, const char *newval,
enum env_op, int flag); enum env_op, int flag);
}; };
/* Create a new hash table which will contain at most "__nel" elements. */ /* Create a new hash table which will contain at most "nel" elements. */
extern int hcreate_r(size_t __nel, struct hsearch_data *__htab); int hcreate_r(size_t nel, struct hsearch_data *htab);
/* Destroy current internal hash table. */ /* Destroy current internal hash table. */
extern void hdestroy_r(struct hsearch_data *__htab); void hdestroy_r(struct hsearch_data *htab);
/* /*
* Search for entry matching __item.key in internal hash table. If * Search for entry matching item.key in internal hash table. If
* __action is `ENV_FIND' return found entry or signal error by returning * action is `ENV_FIND' return found entry or signal error by returning
* NULL. If __action is `ENV_ENTER' replace existing data (if any) with * NULL. If action is `ENV_ENTER' replace existing data (if any) with
* __item.data. * item.data.
* */ * */
extern int hsearch_r(struct env_entry __item, enum env_action __action, int hsearch_r(struct env_entry item, enum env_action action,
struct env_entry **__retval, struct hsearch_data *__htab, struct env_entry **retval, struct hsearch_data *htab, int flag);
int __flag);
/* /*
* Search for an entry matching "__match". Otherwise, Same semantics * Search for an entry matching "match". Otherwise, Same semantics
* as hsearch_r(). * as hsearch_r().
*/ */
extern int hmatch_r(const char *__match, int __last_idx, int hmatch_r(const char *match, int last_idx, struct env_entry **retval,
struct env_entry **__retval, struct hsearch_data *__htab); struct hsearch_data *htab);
/* Search and delete entry matching "__key" in internal hash table. */ /* Search and delete entry matching "key" in internal hash table. */
extern int hdelete_r(const char *__key, struct hsearch_data *__htab, int hdelete_r(const char *key, struct hsearch_data *htab, int flag);
int __flag);
extern ssize_t hexport_r(struct hsearch_data *__htab, ssize_t hexport_r(struct hsearch_data *htab, const char sep, int flag,
const char __sep, int __flag, char **__resp, size_t __size, char **resp, size_t size, int argc, char * const argv[]);
int argc, char * const argv[]);
/* /*
* nvars: length of vars array * nvars: length of vars array
* vars: array of strings (variable names) to import (nvars == 0 means all) * vars: array of strings (variable names) to import (nvars == 0 means all)
*/ */
extern int himport_r(struct hsearch_data *__htab, int himport_r(struct hsearch_data *htab, const char *env, size_t size,
const char *__env, size_t __size, const char __sep, const char sep, int flag, int crlf_is_lf, int nvars,
int __flag, int __crlf_is_lf, int nvars, char * const vars[]);
char * const vars[]);
/* Walk the whole table calling the callback on each element */ /* Walk the whole table calling the callback on each element */
extern int hwalk_r(struct hsearch_data *__htab, int hwalk_r(struct hsearch_data *htab,
int (*callback)(struct env_entry *entry)); int (*callback)(struct env_entry *entry));
/* Flags for himport_r(), hexport_r(), hdelete_r(), and hsearch_r() */ /* Flags for himport_r(), hexport_r(), hdelete_r(), and hsearch_r() */
#define H_NOCLEAR (1 << 0) /* do not clear hash table before importing */ #define H_NOCLEAR (1 << 0) /* do not clear hash table before importing */