From 9882bf5ff8762ebe4741b6380c3ed1088027e5cc Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Sat, 11 Oct 2014 17:35:31 -0400
Subject: [PATCH] Just use strdup

In commit 272f85bb2444 ("Fix silly crash") I indeed fixed the crash, but I
also broke the code. Now a broken userid might end upsaved in the data
file. Oops.

This should be correct now.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 dive.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/dive.c b/dive.c
index c958478bb..9972212aa 100644
--- a/dive.c
+++ b/dive.c
@@ -2505,7 +2505,6 @@ timestamp_t get_times()
 	return dive->when;
 }
 
-#define MAX_USERID_SIZE 32
 void set_save_userid_local(short value)
 {
 	prefs.save_userid_local = value;
@@ -2513,13 +2512,8 @@ void set_save_userid_local(short value)
 
 void set_userid(char *rUserId)
 {
-	prefs.userid = (char *)malloc(MAX_USERID_SIZE + 1);
-	if (prefs.userid && rUserId) {
-		strncpy(prefs.userid, rUserId, MAX_USERID_SIZE);
-		prefs.userid[MAX_USERID_SIZE] = 0;
-	}
+	prefs.userid = strdup(rUserId);
 }
-#undef MAX_USERID_SIZE
 
 int average_depth(struct diveplan *dive)
 {