aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThiago de Arruda <tpadilha84@gmail.com>2014-10-30 10:43:18 -0300
committerThiago de Arruda <tpadilha84@gmail.com>2014-10-31 22:52:10 -0300
commit68015367a057078b4c4a0b6070a9b9d55a011339 (patch)
tree34198eb84d30a414a56574ff59148dc5bedfffe3 /src
parentc92d17b4aab9595f7606dd3509ad39b52ee780af (diff)
downloadrneovim-68015367a057078b4c4a0b6070a9b9d55a011339.tar.gz
rneovim-68015367a057078b4c4a0b6070a9b9d55a011339.tar.bz2
rneovim-68015367a057078b4c4a0b6070a9b9d55a011339.zip
shell: Rename dyn_buffer_t to DynamicBuffer
To follow our coding conventions
Diffstat (limited to 'src')
-rw-r--r--src/nvim/os/shell.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c
index ef95946b68..66a90dea43 100644
--- a/src/nvim/os/shell.c
+++ b/src/nvim/os/shell.c
@@ -25,6 +25,7 @@
#include "nvim/charset.h"
#include "nvim/strings.h"
+#define DYNAMIC_BUFFER_INIT {NULL, 0, 0}
#define BUFFER_LENGTH 1024
typedef struct {
@@ -39,9 +40,8 @@ typedef struct {
typedef struct {
char *data;
- size_t cap;
- size_t len;
-} dyn_buffer_t;
+ size_t cap, len;
+} DynamicBuffer;
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "os/shell.c.generated.h"
@@ -271,8 +271,7 @@ int os_system(const char *cmd,
size_t *nread) FUNC_ATTR_NONNULL_ARG(1)
{
// the output buffer
- dyn_buffer_t buf;
- memset(&buf, 0, sizeof(buf));
+ DynamicBuffer buf = DYNAMIC_BUFFER_INIT;
char **argv = shell_build_argv((char_u *) cmd, NULL);
@@ -328,10 +327,10 @@ int os_system(const char *cmd,
return status;
}
-/// dyn_buf_ensure - ensures at least `desired` bytes in buffer
+/// - ensures at least `desired` bytes in buffer
///
/// TODO(aktau): fold with kvec/garray
-static void dyn_buf_ensure(dyn_buffer_t *buf, size_t desired)
+static void dynamic_buffer_ensure(DynamicBuffer *buf, size_t desired)
{
if (buf->cap >= desired) {
return;
@@ -345,11 +344,11 @@ static void dyn_buf_ensure(dyn_buffer_t *buf, size_t desired)
static void system_data_cb(RStream *rstream, void *data, bool eof)
{
Job *job = data;
- dyn_buffer_t *buf = job_data(job);
+ DynamicBuffer *buf = job_data(job);
size_t nread = rstream_pending(rstream);
- dyn_buf_ensure(buf, buf->len + nread + 1);
+ dynamic_buffer_ensure(buf, buf->len + nread + 1);
rstream_read(rstream, buf->data + buf->len, nread);
buf->len += nread;