Commit 3b3b3e55 authored by Timothy B. Terriberry's avatar Timothy B. Terriberry

Fix two compiler warnings.

Thanks to Mark Harris for the report.
parent 529bd012
...@@ -3422,6 +3422,7 @@ void *op_url_stream_vcreate_impl(OpusFileCallbacks *_cb, ...@@ -3422,6 +3422,7 @@ void *op_url_stream_vcreate_impl(OpusFileCallbacks *_cb,
proxy_user=NULL; proxy_user=NULL;
proxy_pass=NULL; proxy_pass=NULL;
pinfo=NULL; pinfo=NULL;
*_pinfo=NULL;
for(;;){ for(;;){
ptrdiff_t request; ptrdiff_t request;
request=va_arg(_ap,char *)-(char *)NULL; request=va_arg(_ap,char *)-(char *)NULL;
...@@ -3453,7 +3454,6 @@ void *op_url_stream_vcreate_impl(OpusFileCallbacks *_cb, ...@@ -3453,7 +3454,6 @@ void *op_url_stream_vcreate_impl(OpusFileCallbacks *_cb,
} }
/*If the caller has requested server information, proxy it to a local copy to /*If the caller has requested server information, proxy it to a local copy to
simplify error handling.*/ simplify error handling.*/
*_pinfo=NULL;
if(pinfo!=NULL){ if(pinfo!=NULL){
void *ret; void *ret;
opus_server_info_init(_info); opus_server_info_init(_info);
......
...@@ -115,7 +115,7 @@ static int op_tags_ensure_capacity(OpusTags *_tags,size_t _ncomments){ ...@@ -115,7 +115,7 @@ static int op_tags_ensure_capacity(OpusTags *_tags,size_t _ncomments){
/*We only support growing. /*We only support growing.
Trimming requires cleaning up the allocated strings in the old space, and Trimming requires cleaning up the allocated strings in the old space, and
is best handled separately if it's ever needed.*/ is best handled separately if it's ever needed.*/
OP_ASSERT(_ncomments>=cur_ncomments); OP_ASSERT(_ncomments>=(size_t)cur_ncomments);
comment_lengths=_tags->comment_lengths; comment_lengths=_tags->comment_lengths;
comment_lengths=(int *)_ogg_realloc(_tags->comment_lengths,size); comment_lengths=(int *)_ogg_realloc(_tags->comment_lengths,size);
if(OP_UNLIKELY(comment_lengths==NULL))return OP_EFAULT; if(OP_UNLIKELY(comment_lengths==NULL))return OP_EFAULT;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment