diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-06-23 13:02:12 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-06-23 13:02:12 -0600 |
| commit | 0f1e785ca9f420e4443cb7f6482d315b9a79744a (patch) | |
| tree | af762e24ce680b0d7b9b7b188e18e794dae06880 | |
| parent | 19f6299b906d846250a647b214836caf4f3e44fc (diff) | |
| parent | 7456ccf0351c1ac0b42387695048349ca180ab3d (diff) | |
| download | nuttx-0f1e785ca9f420e4443cb7f6482d315b9a79744a.tar.gz nuttx-0f1e785ca9f420e4443cb7f6482d315b9a79744a.tar.bz2 nuttx-0f1e785ca9f420e4443cb7f6482d315b9a79744a.zip | |
Merge remote-tracking branch 'origin/master' into netiob
| -rw-r--r-- | apps/ChangeLog.txt | 3 | ||||
| -rw-r--r-- | apps/netutils/webserver/httpd_fs.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index a94601ff4..5152a1e40 100644 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -937,5 +937,6 @@ light (2014-6-16). * apps/system/hex2bin/hex2mem_main: Add a variant application that will write Intel HEX files directly to memory (2014-6-16). - + * netutils/webserver: httpd_fs_open() should return OK on success and + ERROR on failure, not 1 and 0 (2014-6-23) diff --git a/apps/netutils/webserver/httpd_fs.c b/apps/netutils/webserver/httpd_fs.c index 8d1cddbab..ef49e230a 100644 --- a/apps/netutils/webserver/httpd_fs.c +++ b/apps/netutils/webserver/httpd_fs.c @@ -107,13 +107,14 @@ int httpd_fs_open(const char *name, struct httpd_fs_file *file) #ifdef CONFIG_NETUTILS_HTTPDFSSTATS ++count[i]; #endif - return 1; + return OK; } #ifdef CONFIG_NETUTILS_HTTPDFSSTATS ++i; #endif } - return 0; + + return ERROR; } void httpd_fs_init(void) |