From af421d0dc7efa3bf0c0a79a601bcad6dc55499f9 Mon Sep 17 00:00:00 2001
From: "Rob Swindell (on Windows 11)" <rob@synchro.net>
Date: Sun, 3 Nov 2024 19:30:27 -0800
Subject: [PATCH] Move putuserdat() wrapper to data_ovl.cpp where the other
userdat wrappers are
And have it return bool, like the others. The error logging is different
(not using errormsg), but I think that's okay.
---
src/sbbs3/data_ovl.cpp | 14 ++++++++++++++
src/sbbs3/sbbs.h | 2 +-
src/sbbs3/useredit.cpp | 11 -----------
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/sbbs3/data_ovl.cpp b/src/sbbs3/data_ovl.cpp
index 6fd173ac2a..d6cf70d0fc 100644
--- a/src/sbbs3/data_ovl.cpp
+++ b/src/sbbs3/data_ovl.cpp
@@ -89,6 +89,20 @@ uint sbbs_t::finduserstr(uint usernumber, enum user_field fnum, const char* str
return(i);
}
+/****************************************************************************/
+/* An error checking/logging wrapper for userdat.c putuserdat() */
+/****************************************************************************/
+bool sbbs_t::putuserdat(user_t* user)
+{
+ int result = ::putuserdat(&cfg, user);
+ if(result != 0) {
+ lprintf(LOG_ERR, "!Error %d writing user data for user #%d"
+ ,result, user->number);
+ return false;
+ }
+ return true;
+}
+
bool sbbs_t::putuserstr(int usernumber, enum user_field fnum, const char *str)
{
int result = ::putuserstr(&cfg, usernumber, fnum, str);
diff --git a/src/sbbs3/sbbs.h b/src/sbbs3/sbbs.h
index a3e705215d..1f7a5c3433 100644
--- a/src/sbbs3/sbbs.h
+++ b/src/sbbs3/sbbs.h
@@ -805,6 +805,7 @@ public:
bool putusermisc(int usernumber, uint32_t value);
bool putuserchat(int usernumber, uint32_t value);
bool putuserqwk(int usernumber, uint32_t value);
+ bool putuserdat(user_t*);
uint finduserstr(uint usernumber, enum user_field, const char* str
,bool del=false, bool next=false);
@@ -1322,7 +1323,6 @@ public:
int searchdn(char *search,int usernum);
void maindflts(user_t* user);
void purgeuser(int usernumber);
- void putuserdat(user_t*);
/* ver.cpp */
void ver(void);
diff --git a/src/sbbs3/useredit.cpp b/src/sbbs3/useredit.cpp
index 54b9fa17d3..0e971907fb 100644
--- a/src/sbbs3/useredit.cpp
+++ b/src/sbbs3/useredit.cpp
@@ -1170,14 +1170,3 @@ void sbbs_t::purgeuser(int usernumber)
putusername(&cfg,usernumber,nulstr);
putusermisc(usernumber, user.misc | DELETED);
}
-
-/****************************************************************************/
-/* An error checking/logging wrapper for userdat.c putuserdat() */
-/****************************************************************************/
-void sbbs_t::putuserdat(user_t* user)
-{
- int result = ::putuserdat(&cfg, user);
- if(result != 0)
- lprintf(LOG_ERR, "!Error %d writing user data for user #%d"
- ,result, user->number);
-}
--
GitLab