NxWidgets/NxWM updates from Petteri Aimonen (Patches 0007-0013)
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5689 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
parent
7d20a67179
commit
59d3cbfe2e
@ -1,7 +1,7 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* tools/cfgdefine.c
|
* tools/cfgdefine.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2007-2012 Gregory Nutt. All rights reserved.
|
* Copyright (C) 2007-2013 Gregory Nutt. All rights reserved.
|
||||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
@ -69,6 +69,8 @@ static const char *dequote_list[] =
|
|||||||
/* NxWidgets/NxWM */
|
/* NxWidgets/NxWM */
|
||||||
|
|
||||||
"CONFIG_NXWM_BACKGROUND_IMAGE", /* Name of bitmap image class */
|
"CONFIG_NXWM_BACKGROUND_IMAGE", /* Name of bitmap image class */
|
||||||
|
"CONFIG_NXWM_STOP_BITMAP", /* Name of bitmap image class */
|
||||||
|
"CONFIG_NXWM_MINIMIZE_BITMAP", /* Name of bitmap image class */
|
||||||
"CONFIG_NXWM_STARTWINDOW_ICON", /* Name of bitmap image class */
|
"CONFIG_NXWM_STARTWINDOW_ICON", /* Name of bitmap image class */
|
||||||
"CONFIG_NXWM_NXCONSOLE_ICON", /* Name of bitmap image class */
|
"CONFIG_NXWM_NXCONSOLE_ICON", /* Name of bitmap image class */
|
||||||
"CONFIG_NXWM_CALIBRATION_ICON", /* Name of bitmap image class */
|
"CONFIG_NXWM_CALIBRATION_ICON", /* Name of bitmap image class */
|
||||||
@ -82,7 +84,7 @@ static const char *dequote_list[] =
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
/* Skip over any spaces */
|
/* Skip over any spaces */
|
||||||
|
|
||||||
static char *skip_space(char *ptr)
|
static char *skip_space(char *ptr)
|
||||||
{
|
{
|
||||||
while (*ptr && isspace((int)*ptr)) ptr++;
|
while (*ptr && isspace((int)*ptr)) ptr++;
|
||||||
@ -184,7 +186,7 @@ static void parse_line(char *ptr, char **varname, char **varval)
|
|||||||
/* The variable value should follow =, perhaps separated by some
|
/* The variable value should follow =, perhaps separated by some
|
||||||
* white space.
|
* white space.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
ptr = skip_space(ptr + 1);
|
ptr = skip_space(ptr + 1);
|
||||||
if (*ptr)
|
if (*ptr)
|
||||||
{
|
{
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* tools/cfgpaser.c
|
* tools/cfgpaser.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2007-2012 Gregory Nutt. All rights reserved.
|
* Copyright (C) 2007-2013 Gregory Nutt. All rights reserved.
|
||||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
@ -62,7 +62,7 @@ char line[LINESIZE+1];
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
/* Skip over any spaces */
|
/* Skip over any spaces */
|
||||||
|
|
||||||
static char *skip_space(char *ptr)
|
static char *skip_space(char *ptr)
|
||||||
{
|
{
|
||||||
while (*ptr && isspace((int)*ptr)) ptr++;
|
while (*ptr && isspace((int)*ptr)) ptr++;
|
||||||
@ -164,7 +164,7 @@ static void parse_line(char *ptr, char **varname, char **varval)
|
|||||||
/* The variable value should follow =, perhaps separated by some
|
/* The variable value should follow =, perhaps separated by some
|
||||||
* white space.
|
* white space.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
ptr = skip_space(ptr + 1);
|
ptr = skip_space(ptr + 1);
|
||||||
if (*ptr)
|
if (*ptr)
|
||||||
{
|
{
|
||||||
@ -287,7 +287,7 @@ struct variable_s *find_variable(const char *varname, struct variable_s *list)
|
|||||||
{
|
{
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
list = list->flink;
|
list = list->flink;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user