eliminate bsdstring from reports.c

add missing period at end of region info.

src/report.c

@@ -1183,14 +1183,14 @@ void report_region(struct stream *out, const region * r, faction * f)
             if (wrptr(&bufp, &size, bytes) != 0)
                 WARN_STATIC_BUFFER();
             bytes = (int)str_strlcpy(bufp, "\")", size);
-            if (wrptr(&bufp, &size, bytes) != 0)
-                WARN_STATIC_BUFFER();
-            bytes = (int)str_strlcpy(bufp, ".", size);
             if (wrptr(&bufp, &size, bytes) != 0)
                 WARN_STATIC_BUFFER();
             dh = 1;
         }
     }
+    bytes = (int)str_strlcpy(bufp, ".", size);
+    if (wrptr(&bufp, &size, bytes) != 0)
+        WARN_STATIC_BUFFER();
     *bufp = 0;
     paragraph(out, buf, 0, 0, 0);
 

src/reports.c

@@ -64,7 +64,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* util includes */
 #include "kernel/attrib.h"
 #include "util/base36.h"
-#include "util/bsdstring.h"
 #include "util/functions.h"
 #include "util/goodies.h"
 #include "util/language.h"
@@ -2209,41 +2208,49 @@ const char *get_mailcmd(const struct locale *loc)
     return result;
 }
 
+static void print_trail(const faction *f, const region *r,
+    const struct locale *lang, struct sbstring *sbp)
+{
+    char buf[64];
+    const char *trail = trailinto(r, lang);
+    const char *rn = f_regionid_s(r, f);
+    if (snprintf(buf, sizeof(buf), trail, rn) != 0) {
+        sbs_strcat(sbp, buf);
+    }
+}
+
 static void eval_trail(struct opstack **stack, const void *userdata)
 {                               /* order -> string */
     const faction *report = (const faction *)userdata;
     const struct locale *lang = report ? report->locale : default_locale;
     const arg_regions *aregs = (const arg_regions *)opop(stack).v;
     char buf[512];
-    size_t size = sizeof(buf) - 1;
     variant var;
-    char *bufp = buf;
+    sbstring sbs;
 #ifdef _SECURECRT_ERRCODE_VALUES_DEFINED
-    /* stupid MS broke snprintf */
+    /* MSVC touches errno in snprintf */
     int eold = errno;
 #endif
 
+    sbs_init(&sbs, buf, sizeof(buf));
     if (aregs != NULL) {
         int i, handle_end = 0, begin = 0;
         handle_end = aregs->nregions;
         for (i = begin; i < handle_end; ++i) {
             region *r = aregs->regions[i];
-            const char *trail = trailinto(r, lang);
+            sbs_strcat(&sbs, ", ");
-            const char *rn = f_regionid_s(r, report);
 
-            if (wrptr(&bufp, &size, snprintf(bufp, size, trail, rn)) != 0)
+            print_trail(report, r, lang, &sbs);
-                WARN_STATIC_BUFFER();
 
             if (i + 2 < handle_end) {
-                bufp = STRLCPY(bufp, ", ", size);
+                sbs_strcat(&sbs, ", ");
             }
             else if (i + 1 < handle_end) {
-                bufp = STRLCPY(bufp, LOC(lang, "list_and"), size);
+                sbs_strcat(&sbs, LOC(lang, "list_and"));
             }
         }
     }
-    *bufp = 0;
+    var.v = strcpy(balloc(sbs_length(&sbs)), buf);
-    var.v = strcpy(balloc((size_t)(bufp - buf + 1)), buf);
     opush(stack, var);
 #ifdef _SECURECRT_ERRCODE_VALUES_DEFINED
     if (errno == ERANGE) {
@@ -2252,11 +2259,9 @@ static void eval_trail(struct opstack **stack, const void *userdata)
 #endif
 }
 
-void report_race_skills(const race *rc, char *zText, size_t length, const struct locale *lang)
+void report_race_skills(const race *rc, const struct locale *lang, sbstring *sbp)
 {
-    size_t size = length - 1;
     int dh = 0, dh1 = 0, sk;
-    char *bufp = zText;
 
     for (sk = 0; sk < MAXSKILLS; ++sk) {
         if (skill_enabled(sk) && rc->bonus[sk] > -5)
@@ -2265,29 +2270,30 @@ void report_race_skills(const race *rc, char *zText, size_t length, const struct
 
     for (sk = 0; sk < MAXSKILLS; sk++) {
         if (skill_enabled(sk) && rc->bonus[sk] > -5) {
-            size_t bytes;
             dh--;
             if (dh1 == 0) {
                 dh1 = 1;
             }
             else {
                 if (dh == 0) {
-                    bytes = str_strlcpy(bufp, LOC(lang, "list_and"), size);
+                    sbs_strcat(sbp, LOC(lang, "list_and"));
                 }
                 else {
-                    bytes = str_strlcpy(bufp, ", ", size);
+                    sbs_strcat(sbp, ", ");
                 }
-                assert(bytes <= INT_MAX);
-                BUFFER_STRCAT(bufp, size, bytes);
             }
-            bytes = str_strlcpy(bufp, skillname((skill_t)sk, lang),
+            sbs_strcat(sbp, skillname((skill_t)sk, lang));
-                size);
-            assert(bytes <= INT_MAX);
-            BUFFER_STRCAT(bufp, size, (int)bytes);
         }
     }
 }
 
+void report_race_skills_depr(const race *rc, char *zText, size_t length, const struct locale *lang)
+{
+    sbstring sbs;
+    sbs_init(&sbs, zText, length);
+    report_race_skills(rc, lang, &sbs);
+}
+
 static void eval_direction(struct opstack **stack, const void *userdata)
 {
     const faction *report = (const faction *)userdata;

src/reports.h

@@ -121,7 +121,7 @@ extern "C" {
         const struct unit *owner, const struct faction *viewer);
     void report_warnings(struct faction *f, int now);
     void report_raceinfo(const struct race *rc, const struct locale *lang, struct sbstring *sbp);
-    void report_race_skills(const struct race *rc, char *zText, size_t length, const struct locale *lang);
+    void report_race_skills_depr(const struct race *rc, char *zText, size_t length, const struct locale *lang);
     void report_item(const struct unit *owner, const struct item *i,
         const struct faction *viewer, const char **name, const char **basename,
         int *number, bool singular);

src/spells.c

@@ -592,7 +592,7 @@ static int sp_summon_familiar(castorder * co)
     msg_release(msg);
     make_familiar(caster, r, rc, zText);
 
-    report_race_skills(rc, zText, sizeof(zText), caster->faction->locale);
+    report_race_skills_depr(rc, zText, sizeof(zText), caster->faction->locale);
     ADDMSG(&caster->faction->msgs, msg_message("familiar_describe",
         "mage race skills", caster, rc, zText));
     return cast_level;