diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-29 22:09:31 +0200 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-29 22:09:31 +0200 |
commit | 5132756f09c7a0dafe4644db92718ee3d1a58d6c (patch) | |
tree | 094343cedcd9fe8bacb3380e98d96e952b7115ea /src/dabInputFile.cpp | |
parent | 5c3c6d734ff0c57fd3d45746df23b96e0e7fc99e (diff) | |
parent | e7ad2e1fab9c51189fdc8b4f2d81f625da9dd422 (diff) | |
download | dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.tar.gz dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.tar.bz2 dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.zip |
Merge branch 'next' into servicelinking
Diffstat (limited to 'src/dabInputFile.cpp')
-rw-r--r-- | src/dabInputFile.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dabInputFile.cpp b/src/dabInputFile.cpp index 30ab37d..2847caa 100644 --- a/src/dabInputFile.cpp +++ b/src/dabInputFile.cpp @@ -38,7 +38,7 @@ int dabInputFileInit(void** args) data->parity = false; data->packetLength = 0; data->packetData = new unsigned char[96]; - data->enhancedPacketData = NULL; + data->enhancedPacketData = nullptr; data->enhancedPacketLength = 0; data->enhancedPacketWaiting = 0; @@ -79,12 +79,12 @@ int dabInputFileClose(void* args) int dabInputFileClean(void** args) { dabInputFileData* data = (dabInputFileData*)*args; - if (data->packetData != NULL) { + if (data->packetData != nullptr) { delete[] data->packetData; } - if (data->enhancedPacketData != NULL) { + if (data->enhancedPacketData != nullptr) { for (int i = 0; i < 12; ++i) { - if (data->enhancedPacketData[i] != NULL) { + if (data->enhancedPacketData[i] != nullptr) { delete[] data->enhancedPacketData[i]; } } |