Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
e9081a81
Commit
e9081a81
authored
May 11, 2015
by
dnc40085
Browse files
Remove conflict
parent
f3167104
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/modules/wifi.c
View file @
e9081a81
...
@@ -383,8 +383,8 @@ static int wifi_station_config( lua_State* L )
...
@@ -383,8 +383,8 @@ static int wifi_station_config( lua_State* L )
if
(
sl
>
32
||
ssid
==
NULL
)
if
(
sl
>
32
||
ssid
==
NULL
)
return
luaL_error
(
L
,
"ssid:<32"
);
return
luaL_error
(
L
,
"ssid:<32"
);
const
char
*
password
=
luaL_checklstring
(
L
,
2
,
&
pl
);
const
char
*
password
=
luaL_checklstring
(
L
,
2
,
&
pl
);
if
(
pl
<
8
||
pl
>
64
||
password
==
NULL
)
if
(
pl
>
64
||
password
==
NULL
)
return
luaL_error
(
L
,
"pwd:
8~
64"
);
return
luaL_error
(
L
,
"pwd:
<
64"
);
c_memset
(
sta_conf
.
ssid
,
0
,
32
);
c_memset
(
sta_conf
.
ssid
,
0
,
32
);
c_memset
(
sta_conf
.
password
,
0
,
64
);
c_memset
(
sta_conf
.
password
,
0
,
64
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment