diff --git a/net/Makefile b/net/Makefile index 97c758dd7ba..7880a974ef5 100644 --- a/net/Makefile +++ b/net/Makefile @@ -38,7 +38,7 @@ ifeq ($(CONFIG_NET),y) SOCK_ASRCS = SOCK_CSRCS = socket.c bind.c connect.c sendto.c recv.c recvfrom.c \ - net-sockets.c net-close.c + net_sockets.c net_close.c ifeq ($(CONFIG_NET_TCP),y) SOCK_CSRCS += send.c listen.c accept.c @@ -47,14 +47,14 @@ endif ifeq ($(CONFIG_NET_SOCKOPTS),y) SOCK_CSRCS += setsockopt.c getsockopt.c ifneq ($(CONFIG_DISABLE_CLOCK),y) -SOCK_CSRCS += net-timeo.c net-dsec2timeval.c net-timeval2dsec.c net-arptimer.c +SOCK_CSRCS += net_timeo.c net_dsec2timeval.c net_timeval2dsec.c net_arptimer.c endif endif NETDEV_ASRCS = -NETDEV_CSRCS = netdev-register.c netdev-ioctl.c net-poll.c netdev-txnotify.c \ - netdev-findbyname.c netdev-findbyaddr.c netdev-count.c \ - netdev-foreach.c +NETDEV_CSRCS = netdev_register.c netdev_ioctl.c net_poll.c netdev_txnotify.c \ + netdev_findbyname.c netdev_findbyaddr.c netdev_count.c \ + netdev_foreach.c include uip/Make.defs endif diff --git a/net/accept.c b/net/accept.c index f4c54e5f345..a3a2e067ef2 100644 --- a/net/accept.c +++ b/net/accept.c @@ -50,7 +50,7 @@ #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Definitions diff --git a/net/bind.c b/net/bind.c index d75245c8a2c..381a554bbce 100644 --- a/net/bind.c +++ b/net/bind.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/bind.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ #include #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Global Functions diff --git a/net/connect.c b/net/connect.c index 3bb28638ccd..917049be9d2 100644 --- a/net/connect.c +++ b/net/connect.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/connect.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -49,7 +49,7 @@ #include #include -#include "net-internal.h" +#include "net_internal.h" #include "uip/uip-internal.h" /**************************************************************************** diff --git a/net/getsockopt.c b/net/getsockopt.c index 5b96762c001..186de82af45 100644 --- a/net/getsockopt.c +++ b/net/getsockopt.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/getsockopt.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ #include #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Global Functions diff --git a/net/listen.c b/net/listen.c index 46bad5d94d1..b4d519d9b7e 100644 --- a/net/listen.c +++ b/net/listen.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/listen.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ #include #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Global Functions diff --git a/net/net-arptimer.c b/net/net_arptimer.c similarity index 97% rename from net/net-arptimer.c rename to net/net_arptimer.c index bbb4ef6cb78..e3c281c3871 100644 --- a/net/net-arptimer.c +++ b/net/net_arptimer.c @@ -1,7 +1,7 @@ /**************************************************************************** - * net/net-arptimer.c + * net/net_arptimer.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -46,7 +46,7 @@ #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Definitions diff --git a/net/net-close.c b/net/net_close.c similarity index 98% rename from net/net-close.c rename to net/net_close.c index 1f704ca0003..d94d7cc43c3 100644 --- a/net/net-close.c +++ b/net/net_close.c @@ -1,7 +1,7 @@ /**************************************************************************** - * net/net-close.c + * net/net_close.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -49,7 +49,7 @@ #include #include -#include "net-internal.h" +#include "net_internal.h" #include "uip/uip-internal.h" /**************************************************************************** diff --git a/net/net-dsec2timeval.c b/net/net_dsec2timeval.c similarity index 96% rename from net/net-dsec2timeval.c rename to net/net_dsec2timeval.c index 0ff1ab2c290..f447b91bf27 100644 --- a/net/net-dsec2timeval.c +++ b/net/net_dsec2timeval.c @@ -1,7 +1,7 @@ /**************************************************************************** - * net/net-dsec2timeval.c + * net/net_dsec2timeval.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -45,7 +45,7 @@ #include #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Global Functions diff --git a/net/net-internal.h b/net/net_internal.h similarity index 99% rename from net/net-internal.h rename to net/net_internal.h index 37d22c280d9..ebef372f91d 100644 --- a/net/net-internal.h +++ b/net/net_internal.h @@ -47,8 +47,6 @@ #include #include -#include "net-internal.h" - /**************************************************************************** * Definitions ****************************************************************************/ diff --git a/net/net-poll.c b/net/net_poll.c similarity index 99% rename from net/net-poll.c rename to net/net_poll.c index 6dcb4c2d0a8..2e5eea122d4 100644 --- a/net/net-poll.c +++ b/net/net_poll.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/net-poll.c + * net/net_poll.c * * Copyright (C) 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -54,7 +54,7 @@ #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/net/net-sockets.c b/net/net_sockets.c similarity index 99% rename from net/net-sockets.c rename to net/net_sockets.c index 8463f63d8b6..cda0c105e93 100644 --- a/net/net-sockets.c +++ b/net/net_sockets.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net-sockets.c + * net_sockets.c * * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -51,7 +51,7 @@ #include #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Definitions diff --git a/net/net-timeo.c b/net/net_timeo.c similarity index 96% rename from net/net-timeo.c rename to net/net_timeo.c index 0bc25c03060..e4b95d4ced8 100644 --- a/net/net-timeo.c +++ b/net/net_timeo.c @@ -1,7 +1,7 @@ /**************************************************************************** - * net/net-timeo.c + * net/net_timeo.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -45,7 +45,7 @@ #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Global Functions diff --git a/net/net-timeval2dsec.c b/net/net_timeval2dsec.c similarity index 96% rename from net/net-timeval2dsec.c rename to net/net_timeval2dsec.c index eb68fc4e537..87f6b0966aa 100644 --- a/net/net-timeval2dsec.c +++ b/net/net_timeval2dsec.c @@ -1,7 +1,7 @@ /**************************************************************************** - * net/net-timeval2dsec.c + * net/net_timeval2dsec.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -45,7 +45,7 @@ #include #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Global Functions diff --git a/net/netdev-count.c b/net/netdev_count.c similarity index 97% rename from net/netdev-count.c rename to net/netdev_count.c index c4ca49fd54e..5550b28c4f8 100644 --- a/net/netdev-count.c +++ b/net/netdev_count.c @@ -1,7 +1,7 @@ /**************************************************************************** - * net/netdev-count.c + * net/netdev_count.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -46,7 +46,7 @@ #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Definitions diff --git a/net/netdev-findbyaddr.c b/net/netdev_findbyaddr.c similarity index 97% rename from net/netdev-findbyaddr.c rename to net/netdev_findbyaddr.c index ff4cd7a6df2..1b326b3ba0d 100644 --- a/net/netdev-findbyaddr.c +++ b/net/netdev_findbyaddr.c @@ -1,7 +1,7 @@ /**************************************************************************** - * net/netdev-findbyaddr.c + * net/netdev_findbyaddr.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -47,7 +47,7 @@ #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Definitions diff --git a/net/netdev-findbyname.c b/net/netdev_findbyname.c similarity index 97% rename from net/netdev-findbyname.c rename to net/netdev_findbyname.c index 6c3d59ae352..3a9db0c0d75 100644 --- a/net/netdev-findbyname.c +++ b/net/netdev_findbyname.c @@ -1,7 +1,7 @@ /**************************************************************************** - * net/netdev-findbyname.c + * net/netdev_findbyname.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -46,7 +46,7 @@ #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Definitions diff --git a/net/netdev-foreach.c b/net/netdev_foreach.c similarity index 97% rename from net/netdev-foreach.c rename to net/netdev_foreach.c index 54472eb98bc..760ed20c830 100644 --- a/net/netdev-foreach.c +++ b/net/netdev_foreach.c @@ -1,7 +1,7 @@ /**************************************************************************** - * net/netdev-foreach.c + * net/netdev_foreach.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -45,7 +45,7 @@ #include #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Definitions diff --git a/net/netdev-ioctl.c b/net/netdev_ioctl.c similarity index 98% rename from net/netdev-ioctl.c rename to net/netdev_ioctl.c index f54362ff3f8..c80f75e4ff5 100644 --- a/net/netdev-ioctl.c +++ b/net/netdev_ioctl.c @@ -1,7 +1,7 @@ /**************************************************************************** - * net/netdev-ioctl.c + * net/netdev_ioctl.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -55,7 +55,7 @@ #include #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Definitions diff --git a/net/netdev-register.c b/net/netdev_register.c similarity index 97% rename from net/netdev-register.c rename to net/netdev_register.c index 5f06b665b77..86d8bf83f40 100644 --- a/net/netdev-register.c +++ b/net/netdev_register.c @@ -1,7 +1,7 @@ /**************************************************************************** - * net/netdev-register.c + * net/netdev_register.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -53,7 +53,7 @@ #include #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Definitions diff --git a/net/netdev-txnotify.c b/net/netdev_txnotify.c similarity index 97% rename from net/netdev-txnotify.c rename to net/netdev_txnotify.c index c600e34d38a..0fd03b0c3c3 100644 --- a/net/netdev-txnotify.c +++ b/net/netdev_txnotify.c @@ -1,7 +1,7 @@ /**************************************************************************** - * net/netdev-txnotify.c + * net/netdev_txnotify.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -47,7 +47,7 @@ #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Definitions diff --git a/net/recv.c b/net/recv.c index 135b6f31913..3d5b82f2c2f 100644 --- a/net/recv.c +++ b/net/recv.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/recv.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ #include #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Global Functions diff --git a/net/recvfrom.c b/net/recvfrom.c index 0d0a24db8f6..a74f9c8bd90 100644 --- a/net/recvfrom.c +++ b/net/recvfrom.c @@ -51,7 +51,7 @@ #include #include -#include "net-internal.h" +#include "net_internal.h" #include "uip/uip-internal.h" /**************************************************************************** diff --git a/net/send.c b/net/send.c index 74a96f7f80b..06e1c7177bf 100644 --- a/net/send.c +++ b/net/send.c @@ -51,7 +51,7 @@ #include #include -#include "net-internal.h" +#include "net_internal.h" #include "uip/uip-internal.h" /**************************************************************************** diff --git a/net/sendto.c b/net/sendto.c index 57c37668b22..acf1ea0c888 100644 --- a/net/sendto.c +++ b/net/sendto.c @@ -48,7 +48,7 @@ #include #include -#include "net-internal.h" +#include "net_internal.h" #include "uip/uip-internal.h" /**************************************************************************** diff --git a/net/setsockopt.c b/net/setsockopt.c index 0c4e3d9e414..41fe2e3c310 100644 --- a/net/setsockopt.c +++ b/net/setsockopt.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/setsockopt.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -45,7 +45,7 @@ #include #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Global Functions diff --git a/net/socket.c b/net/socket.c index d9d4e440b90..5e24ea84f32 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/socket.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -45,7 +45,7 @@ #include #include -#include "net-internal.h" +#include "net_internal.h" /**************************************************************************** * Global Functions diff --git a/netutils/webserver/Make.defs b/netutils/webserver/Make.defs index ca35678617d..50fa37cf21d 100644 --- a/netutils/webserver/Make.defs +++ b/netutils/webserver/Make.defs @@ -34,4 +34,4 @@ ############################################################################ WEBSERVER_ASRCS = -WEBSERVER_CSRCS = httpd.c httpd-fs.c httpd-cgi.c +WEBSERVER_CSRCS = httpd.c httpd_fs.c httpd_cgi.c diff --git a/netutils/webserver/httpd.c b/netutils/webserver/httpd.c index 6f1f6dc6ed4..195b619965e 100644 --- a/netutils/webserver/httpd.c +++ b/netutils/webserver/httpd.c @@ -62,7 +62,7 @@ #include #include "httpd.h" -#include "httpd-cgi.h" +#include "httpd_cgi.h" /**************************************************************************** * Definitions diff --git a/netutils/webserver/httpd-cgi.c b/netutils/webserver/httpd_cgi.c similarity index 99% rename from netutils/webserver/httpd-cgi.c rename to netutils/webserver/httpd_cgi.c index 3398e7a7b41..d5b79c22ba0 100644 --- a/netutils/webserver/httpd-cgi.c +++ b/netutils/webserver/httpd_cgi.c @@ -1,4 +1,4 @@ -/* httpd-cgi.c +/* httpd_cgi.c * Web server script interface * Author: Adam Dunkels * @@ -39,7 +39,7 @@ #include #include -#include "httpd-cgi.h" +#include "httpd_cgi.h" #define CONFIG_HTTPDCGI_FILESTATS 1 #undef CONFIG_HTTPDCGI_DCPSTATS diff --git a/netutils/webserver/httpd-cgi.h b/netutils/webserver/httpd_cgi.h similarity index 99% rename from netutils/webserver/httpd-cgi.h rename to netutils/webserver/httpd_cgi.h index c6128513ce9..f5617677865 100644 --- a/netutils/webserver/httpd-cgi.h +++ b/netutils/webserver/httpd_cgi.h @@ -1,4 +1,4 @@ -/* httpd-cgi.h +/* httpd_cgi.h * Web server script interface header file * Author: Adam Dunkels * diff --git a/netutils/webserver/httpd-fs.c b/netutils/webserver/httpd_fs.c similarity index 96% rename from netutils/webserver/httpd-fs.c rename to netutils/webserver/httpd_fs.c index f479aabaaf8..0528f6ed24e 100644 --- a/netutils/webserver/httpd-fs.c +++ b/netutils/webserver/httpd_fs.c @@ -1,7 +1,7 @@ /**************************************************************************** - * netutils/webserver/httpd-fs.c + * netutils/webserver/httpd_fs.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Based on uIP which also has a BSD style license: @@ -46,13 +46,13 @@ #include #include "httpd.h" -#include "httpd-fsdata.h" +#include "httpd_fsdata.h" #ifndef NULL #define NULL 0 #endif /* NULL */ -#include "httpd-fsdata.c" +#include "httpd_fsdata.c" #if HTTPD_FS_STATISTICS static uint16 count[HTTPD_FS_NUMFILES]; diff --git a/netutils/webserver/httpd-fsdata.c b/netutils/webserver/httpd_fsdata.c similarity index 100% rename from netutils/webserver/httpd-fsdata.c rename to netutils/webserver/httpd_fsdata.c diff --git a/netutils/webserver/httpd-fsdata.h b/netutils/webserver/httpd_fsdata.h similarity index 92% rename from netutils/webserver/httpd-fsdata.h rename to netutils/webserver/httpd_fsdata.h index bc5a6659f15..eab255afa99 100644 --- a/netutils/webserver/httpd-fsdata.h +++ b/netutils/webserver/httpd_fsdata.h @@ -1,7 +1,7 @@ /**************************************************************************** - * netutils/webserver/httpd-fsdata.h + * netutils/webserver/httpd_fsdata.h * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Based on uIP which also has a BSD style license: @@ -53,9 +53,9 @@ struct httpd_fsdata_file { const struct httpd_fsdata_file *next; - const unsigned char *name; - const unsigned char *data; - const int len; + FAR const ubyte *name; + FAR const ubyte *data; + int len; #ifdef HTTPD_FS_STATISTICS #if HTTPD_FS_STATISTICS == 1 uint16 count; @@ -65,9 +65,9 @@ struct httpd_fsdata_file struct httpd_fsdata_file_noconst { - struct httpd_fsdata_file *next; - char *name; - char *data; + FAR struct httpd_fsdata_file *next; + FAR char *name; + FAR char *data; int len; #ifdef HTTPD_FS_STATISTICS #if HTTPD_FS_STATISTICS == 1