Merge branch 'master' into 3leaf-rewrite

6 files changed, 10 insertions, 8 deletions

diff --git a/src/include/gpxe/dhcp.h b/src/include/gpxe/dhcp.h
index bbd345c8b..43bccf185 100644
--- a/src/include/gpxe/dhcp.h
+++ b/src/include/gpxe/dhcp.h
@@ -507,7 +507,7 @@ extern void register_dhcp_options ( struct dhcp_option_block *options );
 extern void unregister_dhcp_options ( struct dhcp_option_block *options );
 extern void init_dhcp_options ( struct dhcp_option_block *options,
 				void *data, size_t max_len );
-extern struct dhcp_option_block * alloc_dhcp_options ( size_t max_len );
+extern struct dhcp_option_block * __malloc alloc_dhcp_options ( size_t max_len );
 extern struct dhcp_option *
 set_dhcp_option ( struct dhcp_option_block *options, unsigned int tag,
 		  const void *data, size_t len );
diff --git a/src/include/gpxe/editbox.h b/src/include/gpxe/editbox.h
index 8f2bd2c46..47b07c25d 100644
--- a/src/include/gpxe/editbox.h
+++ b/src/include/gpxe/editbox.h
@@ -28,8 +28,10 @@ struct edit_box {
 
 extern void init_editbox ( struct edit_box *box, char *buf, size_t len,
 			   WINDOW *win, unsigned int row, unsigned int col,
-			   unsigned int width );
-extern void draw_editbox ( struct edit_box *box );
+			   unsigned int width ) 
+			   __attribute__ (( nonnull (1, 2) ));
+extern void draw_editbox ( struct edit_box *box ) __nonnull;
+static inline int __pure edit_editbox ( struct edit_box *box, int key ) __nonnull;
 
 /**
  * Edit text box widget
diff --git a/src/include/gpxe/editstring.h b/src/include/gpxe/editstring.h
index 7f3c5dcb1..fad8bd5a7 100644
--- a/src/include/gpxe/editstring.h
+++ b/src/include/gpxe/editstring.h
@@ -26,6 +26,6 @@ struct edit_string {
 	unsigned int mod_end;
 };
 
-extern int edit_string ( struct edit_string *string, int key );
+extern int edit_string ( struct edit_string *string, int key ) __nonnull;
 
 #endif /* _GPXE_EDITSTRING_H */
diff --git a/src/include/gpxe/iobuf.h b/src/include/gpxe/iobuf.h
index c0dfd434d..e3db01ac2 100644
--- a/src/include/gpxe/iobuf.h
+++ b/src/include/gpxe/iobuf.h
@@ -161,7 +161,7 @@ static inline size_t iob_tailroom ( struct io_buffer *iobuf ) {
 	return ( iobuf->end - iobuf->tail );
 }
 
-extern struct io_buffer * alloc_iob ( size_t len );
+extern struct io_buffer * __malloc alloc_iob ( size_t len );
 extern void free_iob ( struct io_buffer *iobuf );
 extern void iob_pad ( struct io_buffer *iobuf, size_t min_len );
 extern int iob_ensure_headroom ( struct io_buffer *iobuf, size_t len );
diff --git a/src/include/gpxe/malloc.h b/src/include/gpxe/malloc.h
index 0e18f6a35..cce5d1d34 100644
--- a/src/include/gpxe/malloc.h
+++ b/src/include/gpxe/malloc.h
@@ -19,7 +19,7 @@
 
 extern size_t freemem;
 
-extern void * alloc_memblock ( size_t size, size_t align );
+extern void * __malloc alloc_memblock ( size_t size, size_t align );
 extern void free_memblock ( void *ptr, size_t size );
 extern void mpopulate ( void *start, size_t len );
 extern void mdumpfree ( void );
@@ -35,7 +35,7 @@ extern void mdumpfree ( void );
  *
  * @c align must be a power of two.  @c size may not be zero.
  */
-static inline void * malloc_dma ( size_t size, size_t phys_align ) {
+static inline void * __malloc malloc_dma ( size_t size, size_t phys_align ) {
 	return alloc_memblock ( size, phys_align );
 }
 
diff --git a/src/include/gpxe/settings_ui.h b/src/include/gpxe/settings_ui.h
index 01b8f1728..70ee8cb3b 100644
--- a/src/include/gpxe/settings_ui.h
+++ b/src/include/gpxe/settings_ui.h
@@ -9,6 +9,6 @@
 
 struct config_context;
 
-extern int settings_ui ( struct config_context *context );
+extern int settings_ui ( struct config_context *context ) __nonnull;
 
 #endif /* _GPXE_SETTINGS_UI_H */