diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2014-03-09 20:35:37 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2014-03-09 20:35:37 -0700 |
| commit | 5384e241f1e0d225c9439236ab3ba9364ad5b583 (patch) | |
| tree | 9ef1ec0201a7a94f6b7bcde6876b1f68d8b2e52f /sesman/chansrv/fifo.c | |
| parent | ef00f6653b47d92466412bb6a821c4d713b19e22 (diff) | |
| parent | 0a2b3a2fd7e1e55cbc9afc2b26f5be5e63c511c0 (diff) | |
| download | xrdp-proprietary-5384e241f1e0d225c9439236ab3ba9364ad5b583.tar.gz xrdp-proprietary-5384e241f1e0d225c9439236ab3ba9364ad5b583.zip | |
Merge branch 'master' of github.com:neutrinolabs/xrdp
Diffstat (limited to 'sesman/chansrv/fifo.c')
| -rw-r--r-- | sesman/chansrv/fifo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sesman/chansrv/fifo.c b/sesman/chansrv/fifo.c index 630df3cd..b212736a 100644 --- a/sesman/chansrv/fifo.c +++ b/sesman/chansrv/fifo.c @@ -24,6 +24,7 @@ #include "fifo.h" #include "mlog.h" +#include "os_calls.h" /** * Initialize a FIFO that grows as required @@ -50,7 +51,7 @@ fifo_init(FIFO* fp, int num_entries) fp->rd_ptr = 0; fp->wr_ptr = 0; - fp->user_data = (long *) g_malloc(sizeof(long) * num_entries); + fp->user_data = (long *) g_malloc(sizeof(long) * num_entries, 1); if (fp->user_data) { @@ -94,6 +95,7 @@ fifo_deinit(FIFO* fp) fp->rd_ptr = 0; fp->wr_ptr = 0; fp->entries = 0; + return 0; } /** @@ -148,7 +150,7 @@ fifo_insert(FIFO* fp, void* data) if (next_val == fp->rd_ptr) { /* FIFO is full, expand it by 10 entries */ - lp = (long *) g_malloc(sizeof(long) * (fp->entries + 10)); + lp = (long *) g_malloc(sizeof(long) * (fp->entries + 10), 1); if (!lp) { log_debug_low("FIFO full; cannot expand, no memory"); @@ -233,8 +235,6 @@ fifo_remove(FIFO* fp) void* fifo_peek(FIFO* fp) { - long data; - log_debug_high("entered\n"); if (!fp) |