summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVan de Bugger <van.de.bugger@gmail.com>2011-02-18 23:21:34 +0300
committerPeter Hutterer <peter.hutterer@who-t.net>2011-02-23 07:53:33 +1000
commit2e16de3e81e0bbaa85462b4750fa9c3904658627 (patch)
tree8a0565c4d51323f94518bf7262ced9e88824ba0a
parent9ee200aa234c02d5beb843f58def9cdb3fa04156 (diff)
Minor style fixes.
Few tabs replaced with spaces; pointers are written as "list_t *list" (no space between asterisk and variable name). Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--setxkbmap.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/setxkbmap.c b/setxkbmap.c
index 1ed492a..4f85a95 100644
--- a/setxkbmap.c
+++ b/setxkbmap.c
@@ -86,8 +86,8 @@ static char *srcName[NUM_SOURCES] = {
};
struct setting {
- char const * name; /* Human-readable setting name. Used for error reporting. */
- char * value; /* Holds the value. */
+ char const *name; /* Human-readable setting name. Used for error reporting. */
+ char *value; /* Holds the value. */
enum source src; /* Holds the source. */
};
@@ -135,9 +135,9 @@ static XkbRF_VarDefsRec rdefs;
static Bool clearOptions = False;
struct list {
- char ** item; /* Array of items. */
- int sz; /* Size of array. */
- int num; /* Number of used elements. */
+ char **item; /* Array of items. */
+ int sz; /* Size of array. */
+ int num; /* Number of used elements. */
};
typedef struct list list_t;
@@ -172,17 +172,17 @@ static int deviceSpec = XkbUseCoreKbd;
/***====================================================================***/
-Bool addToList(list_t * list, char *newVal);
+Bool addToList(list_t *list, char *newVal);
void usage(int argc, char **argv);
void dumpNames(Bool wantRules, Bool wantCNames);
void trySetString(setting_t * setting, char *newVal, enum source src);
-Bool setOptString(int *arg, int argc, char **argv, setting_t * setting, enum source src);
+Bool setOptString(int *arg, int argc, char **argv, setting_t *setting, enum source src);
int parseArgs(int argc, char **argv);
Bool getDisplay(int argc, char **argv);
Bool getServerValues(void);
FILE *findFileInPath(char *name, char *subdir);
-Bool addStringToOptions(char *opt_str, list_t * opts);
-char *stringFromOptions(char *orig, list_t * newOpts);
+Bool addStringToOptions(char *opt_str, list_t *opts);
+char *stringFromOptions(char *orig, list_t *newOpts);
Bool applyConfig(char *name);
Bool applyRules(void);
Bool applyComponentNames(void);
@@ -196,7 +196,7 @@ void printKeymap(void);
*/
Bool
-addToList(list_t * list, char *newVal)
+addToList(list_t *list, char *newVal)
{
register int i;
@@ -313,7 +313,7 @@ dumpNames(Bool wantRules, Bool wantCNames)
* @param which What value is it (one of RULES_NDX, CONFIG_NDX, ...)
*/
void
-trySetString(setting_t * setting, char *newVal, enum source src)
+trySetString(setting_t *setting, char *newVal, enum source src)
{
if (setting->value != NULL)
{
@@ -339,7 +339,7 @@ trySetString(setting_t * setting, char *newVal, enum source src)
}
Bool
-setOptString(int *arg, int argc, char **argv, setting_t * setting, enum source src)
+setOptString(int *arg, int argc, char **argv, setting_t *setting, enum source src)
{
int ndx;
char *opt;
@@ -658,7 +658,7 @@ findFileInPath(char *name, char *subdir)
/***====================================================================***/
Bool
-addStringToOptions(char *opt_str, list_t * opts)
+addStringToOptions(char *opt_str, list_t *opts)
{
char *tmp, *str, *next;
Bool ok = True;
@@ -682,7 +682,7 @@ addStringToOptions(char *opt_str, list_t * opts)
/***====================================================================***/
char *
-stringFromOptions(char *orig, list_t * newOpts)
+stringFromOptions(char *orig, list_t *newOpts)
{
int len, i, nOut;