StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move ISEMPTY to utils.h 

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2012-08-13 13:49:17 +03:00
parent f491285a5f
commit e535352828
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils.h
View File

@ -61,6 +61,12 @@ strdup_safe(const char *s)
return s ? strdup(s) : NULL;
}
static inline bool
isempty(const char *s)
{
return s == NULL || s[0] == '\0';
}
/* Compiler Attributes */
#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__)

8
src/xkbcomp/xkbcomp.c
View File

@ -28,8 +28,6 @@
#include "rules.h"
#include "parseutils.h"
#define ISEMPTY(str) (!(str) || (strlen(str) == 0))
static XkbFile *
keymap_file_from_names(struct xkb_context *ctx,
const struct xkb_rule_names *rmlvo)
@ -226,11 +224,11 @@ xkb_map_new_from_names(struct xkb_context *ctx,
struct xkb_rule_names rmlvo = *rmlvo_in;
XkbFile *file;
if (ISEMPTY(rmlvo.rules))
if (isempty(rmlvo.rules))
rmlvo.rules = DEFAULT_XKB_RULES;
if (ISEMPTY(rmlvo.model))
if (isempty(rmlvo.model))
rmlvo.model = DEFAULT_XKB_MODEL;
if (ISEMPTY(rmlvo.layout))
if (isempty(rmlvo.layout))
rmlvo.layout = DEFAULT_XKB_LAYOUT;
file = keymap_file_from_names(ctx, &rmlvo);