summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsin <sin@2f30.org>2014-10-05 21:46:07 +0100
committersin <sin@2f30.org>2014-10-05 21:46:07 +0100
commit8cf5ff98325f2899c4ecc932440c228f1f46a46b (patch)
tree181a290fcfaa601e7ec817a1ea9335fd1161d54a
parent5f895de8fdc58c4e1b51ffd982bf4c469015d0ff (diff)
Factor out check for NULL frame
-rw-r--r--ratox.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ratox.c b/ratox.c
index decc73d..0aa4e28 100644
--- a/ratox.c
+++ b/ratox.c
@@ -445,8 +445,6 @@ cbcallringing(void *av, int32_t cnum, void *udata)
static void
preparetxcall(struct friend *f)
{
- if (f->av.frame)
- return;
f->av.frame = malloc(sizeof(int16_t) * framesize);
if (!f->av.frame)
eprintf("malloc:");
@@ -580,7 +578,8 @@ sendfriendcalldata(struct friend *f)
ssize_t n, payloadsize;
struct timespec now, diff;
- preparetxcall(f);
+ if (!f->av.frame)
+ preparetxcall(f);
n = fiforead(f->dirfd, &f->fd[FCALL_IN], ffiles[FCALL_IN],
f->av.frame + f->av.incompleteframe * f->av.n,