From 7ece8ff85c97535a9979cc4e2fb319084dbb1f6f Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 19 Oct 2013 16:40:40 +0200
Subject: [PATCH] Permission: remove nullptr check
Both callers pass non-nullptr.
---
src/Permission.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Permission.cxx b/src/Permission.cxx
index daf24e184..95a164fc4 100644
--- a/src/Permission.cxx
+++ b/src/Permission.cxx
@@ -29,6 +29,7 @@
#include <glib.h>
+#include <assert.h>
#include <string.h>
static constexpr char PERMISSION_PASSWORD_CHAR = '@';
@@ -45,12 +46,11 @@ static unsigned permission_default;
static unsigned parsePermissions(const char *string)
{
+ assert(string != nullptr);
+
unsigned permission = 0;
gchar **tokens;
- if (!string)
- return 0;
-
tokens = g_strsplit(string, PERMISSION_SEPERATOR, 0);
for (unsigned i = 0; tokens[i] != NULL; ++i) {
char *temp = tokens[i];