From 92ffad1a72bc8c422426d52ac408bd71242dd047 Mon Sep 17 00:00:00 2001
From: iphydf <iphydf@users.noreply.github.com>
Date: Sun, 28 Jan 2018 21:30:39 +0000
Subject: Use nullptr as NULL pointer constant instead of NULL or 0.

This changes only code, no string literals or comments.
---
 toxav/groupav.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'toxav/groupav.c')

diff --git a/toxav/groupav.c b/toxav/groupav.c
index 418a42aa..c19c1b3c 100644
--- a/toxav/groupav.c
+++ b/toxav/groupav.c
@@ -55,12 +55,12 @@ static Group_JitterBuffer *create_queue(unsigned int capacity)
     Group_JitterBuffer *q;
 
     if (!(q = (Group_JitterBuffer *)calloc(sizeof(Group_JitterBuffer), 1))) {
-        return NULL;
+        return nullptr;
     }
 
     if (!(q->queue = (Group_Audio_Packet **)calloc(sizeof(Group_Audio_Packet *), size))) {
         free(q);
-        return NULL;
+        return nullptr;
     }
 
     q->size = size;
@@ -73,7 +73,7 @@ static void clear_queue(Group_JitterBuffer *q)
     for (; q->bottom != q->top; ++q->bottom) {
         if (q->queue[q->bottom % q->size]) {
             free(q->queue[q->bottom % q->size]);
-            q->queue[q->bottom % q->size] = NULL;
+            q->queue[q->bottom % q->size] = nullptr;
         }
     }
 }
@@ -132,14 +132,14 @@ static Group_Audio_Packet *dequeue(Group_JitterBuffer *q, int *success)
 {
     if (q->top == q->bottom) {
         *success = 0;
-        return NULL;
+        return nullptr;
     }
 
     unsigned int num = q->bottom % q->size;
 
     if (q->queue[num]) {
         Group_Audio_Packet *ret = q->queue[num];
-        q->queue[num] = NULL;
+        q->queue[num] = nullptr;
         ++q->bottom;
         *success = 1;
         return ret;
@@ -148,11 +148,11 @@ static Group_Audio_Packet *dequeue(Group_JitterBuffer *q, int *success)
     if ((uint32_t)(q->top - q->bottom) > q->capacity) {
         ++q->bottom;
         *success = 2;
-        return NULL;
+        return nullptr;
     }
 
     *success = 0;
-    return NULL;
+    return nullptr;
 }
 
 typedef struct {
@@ -190,7 +190,7 @@ static int recreate_encoder(Group_AV *group_av)
 {
     if (group_av->audio_encoder) {
         opus_encoder_destroy(group_av->audio_encoder);
-        group_av->audio_encoder = NULL;
+        group_av->audio_encoder = nullptr;
     }
 
     int rc = OPUS_OK;
@@ -199,7 +199,7 @@ static int recreate_encoder(Group_AV *group_av)
 
     if (rc != OPUS_OK) {
         LOGGER_ERROR(group_av->log, "Error while starting audio encoder: %s", opus_strerror(rc));
-        group_av->audio_encoder = NULL;
+        group_av->audio_encoder = nullptr;
         return -1;
     }
 
@@ -208,7 +208,7 @@ static int recreate_encoder(Group_AV *group_av)
     if (rc != OPUS_OK) {
         LOGGER_ERROR(group_av->log, "Error while setting encoder ctl: %s", opus_strerror(rc));
         opus_encoder_destroy(group_av->audio_encoder);
-        group_av->audio_encoder = NULL;
+        group_av->audio_encoder = nullptr;
         return -1;
     }
 
@@ -217,7 +217,7 @@ static int recreate_encoder(Group_AV *group_av)
     if (rc != OPUS_OK) {
         LOGGER_ERROR(group_av->log, "Error while setting encoder ctl: %s", opus_strerror(rc));
         opus_encoder_destroy(group_av->audio_encoder);
-        group_av->audio_encoder = NULL;
+        group_av->audio_encoder = nullptr;
         return -1;
     }
 
@@ -229,13 +229,13 @@ static Group_AV *new_group_av(Logger *log, Group_Chats *g_c, void (*audio_callba
                               unsigned int, uint8_t, unsigned int, void *), void *userdata)
 {
     if (!g_c) {
-        return NULL;
+        return nullptr;
     }
 
     Group_AV *group_av = (Group_AV *)calloc(1, sizeof(Group_AV));
 
     if (!group_av) {
-        return NULL;
+        return nullptr;
     }
 
     group_av->log = log;
@@ -296,7 +296,7 @@ static int decode_audio_packet(Group_AV *group_av, Group_Peer_AV *peer_av, int g
         return -1;
     }
 
-    int16_t *out_audio = NULL;
+    int16_t *out_audio = nullptr;
     int out_audio_samples = 0;
 
     unsigned int sample_rate = 48000;
@@ -317,7 +317,7 @@ static int decode_audio_packet(Group_AV *group_av, Group_Peer_AV *peer_av, int g
         if (channels != peer_av->decoder_channels) {
             if (peer_av->audio_decoder) {
                 opus_decoder_destroy(peer_av->audio_decoder);
-                peer_av->audio_decoder = NULL;
+                peer_av->audio_decoder = nullptr;
             }
 
             int rc;
@@ -366,7 +366,7 @@ static int decode_audio_packet(Group_AV *group_av, Group_Peer_AV *peer_av, int g
             return -1;
         }
 
-        out_audio_samples = opus_decode(peer_av->audio_decoder, NULL, 0, out_audio, peer_av->last_packet_samples, 1);
+        out_audio_samples = opus_decode(peer_av->audio_decoder, nullptr, 0, out_audio, peer_av->last_packet_samples, 1);
 
         if (out_audio_samples <= 0) {
             free(out_audio);
@@ -436,7 +436,7 @@ static int groupchat_enable_av(Logger *log, Group_Chats *g_c, int groupnumber, v
 
     Group_AV *group_av = new_group_av(log, g_c, audio_callback, userdata);
 
-    if (group_av == NULL) {
+    if (group_av == nullptr) {
         return -1;
     }
 
-- 
cgit v1.2.3