[PATCH setxkbap] Minor style fixes.

Peter Hutterer peter.hutterer at who-t.net
Mon Feb 21 21:26:14 PST 2011


On Fri, Feb 18, 2011 at 11:21:34PM +0300, Van de Bugger wrote:
> Few tabs replaced with spaces; pointers are written as
> "list_t *list" (no space between asterisk and variable name).
> ---

merged, thanks.

Cheers,
  Peter

>  setxkbmap.c |   28 ++++++++++++++--------------
>  1 files changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/setxkbmap.c b/setxkbmap.c
> index 07e9267..cb385f9 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;
>  
> -- 
> 1.7.4
> 


More information about the xorg-devel mailing list