From 4b64536ee7fd0438c93d1784824098f826cd642c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 11 May 2015 20:09:58 +0200 Subject: util: optimize free_and_strdup() if NOP Under the assumption that strcmp() is cheaper than memory allocation, let's avoid the allocation, if the new value is identical to the old. --- src/shared/util.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/shared') diff --git a/src/shared/util.c b/src/shared/util.c index c5c1b0ccbf..de891447e7 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -5682,6 +5682,9 @@ int free_and_strdup(char **p, const char *s) { /* Replaces a string pointer with an strdup()ed new string, * possibly freeing the old one. */ + if (streq_ptr(*p, s)) + return 0; + if (s) { t = strdup(s); if (!t) @@ -5692,7 +5695,7 @@ int free_and_strdup(char **p, const char *s) { free(*p); *p = t; - return 0; + return 1; } int sethostname_idempotent(const char *s) { -- cgit v1.2.3-54-g00ecf