[OpenWrt-Devel] [PATCH 1/3] [ubox] validate: fix indentation

[John Crispin]

Hi,

blogic at debian:/openwrt/ubox$ git am 5748
Applying: validate: fix indentation
blogic at debian:/openwrt/ubox$ git am 5749
Applying: validate: fix indentation
error: patch failed: validate/validate.c:882
error: validate/validate.c: patch does not apply
Patch failed at 0001 validate: fix indentation
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
blogic at debian:/openwrt/ubox$ git am --abort
blogic at debian:/openwrt/ubox$ patch -p1 < 5749
patching file validate/validate.c
Reversed (or previously applied) patch detected!  Assume -R? [n] n
Apply anyway? [n] y
Hunk #1 FAILED at 882.
1 out of 1 hunk FAILED -- saving rejects to file validate/validate.c.rej
blogic at debian:/openwrt/ubox$






On 27/06/2014 11:09, Luka Perkov wrote:
> Signed-off-by: Luka Perkov <luka at openwrt.org> --- 
> validate/validate.c | 88
> ++++++++++++++++++++++++++--------------------------- 1 file
> changed, 44 insertions(+), 44 deletions(-)
> 
> diff --git a/validate/validate.c b/validate/validate.c index
> 150c08d..f550e76 100644 --- a/validate/validate.c +++
> b/validate/validate.c @@ -882,50 +882,50 @@ dt_type_uci(struct
> dt_state *s, int nargs)
> 
> 
> static struct dt_fun dt_types[] = { -	{ "or",				DT_INVALID,
> dt_type_or			}, -	{ "and",			DT_INVALID,		dt_type_and			}, -	{
> "not",			DT_INVALID,		dt_type_not			}, -	{ "neg",			DT_INVALID,
> dt_type_neg			}, -	{ "list",			DT_INVALID,		dt_type_list		}, -	{
> "min",			DT_NUMBER,		dt_type_min			}, -	{ "max",			DT_NUMBER,
> dt_type_max			}, -	{ "range",			DT_NUMBER,		dt_type_range		}, -	{
> "minlength",		DT_STRING,		dt_type_minlen		}, -	{ "maxlength",
> DT_STRING,		dt_type_maxlen		}, -	{ "rangelength",	DT_STRING,
> dt_type_rangelen	}, -	{ "integer",		DT_NUMBER,		dt_type_int			}, -
> { "uinteger",		DT_NUMBER,		dt_type_uint		}, -	{ "float",
> DT_NUMBER,		dt_type_float		}, -	{ "ufloat",			DT_NUMBER,
> dt_type_ufloat		}, -	{ "bool",			DT_BOOL,		dt_type_bool		}, -	{
> "string",			DT_STRING,		dt_type_string		}, -	{ "hexstring",
> DT_STRING,		dt_type_hexstring	}, -	{ "ip4addr",		DT_STRING,
> dt_type_ip4addr		}, -	{ "ip6addr",		DT_STRING,		dt_type_ip6addr
> }, -	{ "ipaddr",			DT_STRING,		dt_type_ipaddr		}, -	{ "cidr4",
> DT_STRING,		dt_type_cidr4		}, -	{ "cidr6",			DT_STRING,
> dt_type_cidr6		}, -	{ "cidr",			DT_STRING,		dt_type_cidr		}, -	{
> "netmask4",		DT_STRING,		dt_type_netmask4	}, -	{ "netmask6",
> DT_STRING,		dt_type_netmask6	}, -	{ "ipmask4",		DT_STRING,
> dt_type_ipmask4		}, -	{ "ipmask6",		DT_STRING,		dt_type_ipmask6
> }, -	{ "ipmask",			DT_STRING,		dt_type_ipmask		}, -	{ "port",
> DT_NUMBER,		dt_type_port		}, -	{ "portrange",		DT_STRING,
> dt_type_portrange	}, -	{ "macaddr",		DT_STRING,		dt_type_macaddr
> }, -	{ "uciname",		DT_STRING,		dt_type_uciname		}, -	{ "wpakey",
> DT_STRING,		dt_type_wpakey		}, -	{ "wepkey",			DT_STRING,
> dt_type_wepkey		}, -	{ "hostname",		DT_STRING,		dt_type_hostname
> }, -	{ "host",			DT_STRING,		dt_type_host		}, -	{ "network",
> DT_STRING,		dt_type_network		}, -	{ "phonedigit",		DT_STRING,
> dt_type_phonedigit	}, -	{ "directory",		DT_STRING,
> dt_type_directory	}, -	{ "device",			DT_STRING,		dt_type_device
> }, -	{ "file",			DT_STRING,		dt_type_file		}, -	{ "regex",
> DT_STRING,		dt_type_regex		}, -	{ "uci",			DT_STRING,		dt_type_uci
> }, +	{ "or",			DT_INVALID,	dt_type_or		}, +	{ "and",		DT_INVALID,
> dt_type_and		}, +	{ "not",		DT_INVALID,	dt_type_not		}, +	{ "neg",
> DT_INVALID,	dt_type_neg		}, +	{ "list",		DT_INVALID,	dt_type_list
> }, +	{ "min",		DT_NUMBER,	dt_type_min		}, +	{ "max",		DT_NUMBER,
> dt_type_max		}, +	{ "range",		DT_NUMBER,	dt_type_range		}, +	{
> "minlength",		DT_STRING,	dt_type_minlen		}, +	{ "maxlength",
> DT_STRING,	dt_type_maxlen		}, +	{ "rangelength",	DT_STRING,
> dt_type_rangelen	}, +	{ "integer",		DT_NUMBER,	dt_type_int		}, +	{
> "uinteger",		DT_NUMBER,	dt_type_uint		}, +	{ "float",		DT_NUMBER,
> dt_type_float		}, +	{ "ufloat",		DT_NUMBER,	dt_type_ufloat		}, +	{
> "bool",		DT_BOOL,	dt_type_bool		}, +	{ "string",		DT_STRING,
> dt_type_string		}, +	{ "hexstring",		DT_STRING,	dt_type_hexstring
> }, +	{ "ip4addr",		DT_STRING,	dt_type_ip4addr		}, +	{ "ip6addr",
> DT_STRING,	dt_type_ip6addr		}, +	{ "ipaddr",		DT_STRING,
> dt_type_ipaddr		}, +	{ "cidr4",		DT_STRING,	dt_type_cidr4		}, +	{
> "cidr6",		DT_STRING,	dt_type_cidr6		}, +	{ "cidr",		DT_STRING,
> dt_type_cidr		}, +	{ "netmask4",		DT_STRING,	dt_type_netmask4	}, +
> { "netmask6",		DT_STRING,	dt_type_netmask6	}, +	{ "ipmask4",
> DT_STRING,	dt_type_ipmask4		}, +	{ "ipmask6",		DT_STRING,
> dt_type_ipmask6		}, +	{ "ipmask",		DT_STRING,	dt_type_ipmask		}, +
> { "port",		DT_NUMBER,	dt_type_port		}, +	{ "portrange",		DT_STRING,
> dt_type_portrange	}, +	{ "macaddr",		DT_STRING,	dt_type_macaddr
> }, +	{ "uciname",		DT_STRING,	dt_type_uciname		}, +	{ "wpakey",
> DT_STRING,	dt_type_wpakey		}, +	{ "wepkey",		DT_STRING,
> dt_type_wepkey		}, +	{ "hostname",		DT_STRING,	dt_type_hostname	}, 
> +	{ "host",		DT_STRING,	dt_type_host		}, +	{ "network",		DT_STRING,
> dt_type_network		}, +	{ "phonedigit",		DT_STRING,
> dt_type_phonedigit	}, +	{ "directory",		DT_STRING,
> dt_type_directory	}, +	{ "device",		DT_STRING,	dt_type_device		}, +
> { "file",		DT_STRING,	dt_type_file		}, +	{ "regex",		DT_STRING,
> dt_type_regex		}, +	{ "uci",		DT_STRING,	dt_type_uci		},
> 
> { } };
> 
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel