diff options
author | Kinsey Moore <kmoore@digium.com> | 2012-03-22 19:51:16 +0000 |
---|---|---|
committer | Kinsey Moore <kmoore@digium.com> | 2012-03-22 19:51:16 +0000 |
commit | c5b3db1956a3db2446b0310b3a7d59961fe3e089 (patch) | |
tree | 530b55034f5adfb0c7106ae1194679a031afc888 /main/slinfactory.c | |
parent | 1d1c28ac4b09df2b663123e55239e411b8f5ad26 (diff) |
Kill off red blobs in most of main/*
Everything still compiled after making these changes, so I assume these
whitespace-only changes didn't break anything (and shouldn't have).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@360190 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/slinfactory.c')
-rw-r--r-- | main/slinfactory.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/main/slinfactory.c b/main/slinfactory.c index 338305b40..6e31bf0d0 100644 --- a/main/slinfactory.c +++ b/main/slinfactory.c @@ -32,7 +32,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/slinfactory.h" #include "asterisk/translate.h" -void ast_slinfactory_init(struct ast_slinfactory *sf) +void ast_slinfactory_init(struct ast_slinfactory *sf) { memset(sf, 0, sizeof(*sf)); sf->offset = sf->hold; @@ -51,7 +51,7 @@ int ast_slinfactory_init_with_format(struct ast_slinfactory *sf, const struct as return 0; } -void ast_slinfactory_destroy(struct ast_slinfactory *sf) +void ast_slinfactory_destroy(struct ast_slinfactory *sf) { struct ast_frame *f; @@ -100,7 +100,7 @@ int ast_slinfactory_feed(struct ast_slinfactory *sf, struct ast_frame *f) if (!(begin_frame = ast_translate(sf->trans, f, 0))) { return 0; } - + if (!(duped_frame = ast_frisolate(begin_frame))) { return 0; } @@ -132,7 +132,7 @@ int ast_slinfactory_feed(struct ast_slinfactory *sf, struct ast_frame *f) return x; } -int ast_slinfactory_read(struct ast_slinfactory *sf, short *buf, size_t samples) +int ast_slinfactory_read(struct ast_slinfactory *sf, short *buf, size_t samples) { struct ast_frame *frame_ptr; unsigned int sofar = 0, ineed, remain; @@ -157,10 +157,10 @@ int ast_slinfactory_read(struct ast_slinfactory *sf, short *buf, size_t samples) } continue; } - + if ((frame_ptr = AST_LIST_REMOVE_HEAD(&sf->queue, frame_list))) { frame_data = frame_ptr->data.ptr; - + if (frame_ptr->samples <= ineed) { memcpy(offset, frame_data, frame_ptr->samples * sizeof(*offset)); sofar += frame_ptr->samples; |