4 files changed, 8 insertions, 0 deletions
diff --git a/src/nvim/event/rstream.c b/src/nvim/event/rstream.c
index 9d2439ac2b..7283cca02b 100644
--- a/src/nvim/event/rstream.c
+++ b/src/nvim/event/rstream.c
@@ -49,6 +49,7 @@ void rstream_init(Stream *stream, size_t bufsize)
 ///
 /// @param stream The `Stream` instance
 void rstream_start(Stream *stream, stream_read_cb cb)
+  FUNC_ATTR_NONNULL_ARG(1)
 {
   stream->read_cb = cb;
   if (stream->uvstream) {
@@ -62,6 +63,7 @@ void rstream_start(Stream *stream, stream_read_cb cb)
 ///
 /// @param stream The `Stream` instance
 void rstream_stop(Stream *stream)
+  FUNC_ATTR_NONNULL_ALL
 {
   if (stream->uvstream) {
     uv_read_stop(stream->uvstream);
diff --git a/src/nvim/event/socket.c b/src/nvim/event/socket.c
index bdc632abf0..2a618d290d 100644
--- a/src/nvim/event/socket.c
+++ b/src/nvim/event/socket.c
@@ -113,6 +113,7 @@ int socket_watcher_start(SocketWatcher *watcher, int backlog, socket_cb cb)
 }
 
 int socket_watcher_accept(SocketWatcher *watcher, Stream *stream, void *data)
+  FUNC_ATTR_NONNULL_ARG(1) FUNC_ATTR_NONNULL_ARG(2)
 {
   uv_stream_t *client;
 
diff --git a/src/nvim/event/stream.c b/src/nvim/event/stream.c
index 959b532146..72dabc3ce7 100644
--- a/src/nvim/event/stream.c
+++ b/src/nvim/event/stream.c
@@ -32,6 +32,7 @@ int stream_set_blocking(int fd, bool blocking)
 
 void stream_init(Loop *loop, Stream *stream, int fd, uv_stream_t *uvstream,
     void *data)
+  FUNC_ATTR_NONNULL_ARG(2)
 {
   stream->uvstream = uvstream;
 
@@ -72,6 +73,7 @@ void stream_init(Loop *loop, Stream *stream, int fd, uv_stream_t *uvstream,
 }
 
 void stream_close(Stream *stream, stream_close_cb on_stream_close)
+  FUNC_ATTR_NONNULL_ARG(1)
 {
   assert(!stream->closed);
 
@@ -88,6 +90,7 @@ void stream_close(Stream *stream, stream_close_cb on_stream_close)
 }
 
 void stream_close_handle(Stream *stream)
+  FUNC_ATTR_NONNULL_ALL
 {
   if (stream->uvstream) {
     uv_close((uv_handle_t *)stream->uvstream, close_cb);
diff --git a/src/nvim/event/wstream.c b/src/nvim/event/wstream.c
index 5fcb724fe3..8028e35e6b 100644
--- a/src/nvim/event/wstream.c
+++ b/src/nvim/event/wstream.c
@@ -118,6 +118,7 @@ WBuffer *wstream_new_buffer(char *data,
                             size_t size,
                             size_t refcount,
                             wbuffer_data_finalizer cb)
+  FUNC_ATTR_NONNULL_ARG(1)
 {
   WBuffer *rv = xmalloc(sizeof(WBuffer));
   rv->size = size;
@@ -151,6 +152,7 @@ static void write_cb(uv_write_t *req, int status)
 }
 
 void wstream_release_wbuffer(WBuffer *buffer)
+  FUNC_ATTR_NONNULL_ALL
 {
   if (!--buffer->refcount) {
     if (buffer->cb) {