more sprintf removals

[citadel.git] / citadel / serv_network.c

diff --git a/citadel/serv_network.c b/citadel/serv_network.c
index 02dc5e2357e5d0d8fe6636cbb304e2e619674333..164e890c9d9ecd75078c42785b279741f7e25326 100644 (file)
--- a/citadel/serv_network.c
+++ b/citadel/serv_network.c
@@ -322,7 +322,7 @@ void cmd_gnet(char *argbuf) {
        FILE *fp;
 
        if (CtdlAccessCheck(ac_room_aide)) return;
-       assoc_file_name(filename, &CC->quickroom, "netconfigs");
+       assoc_file_name(filename, sizeof filename, &CC->quickroom, "netconfigs");
        cprintf("%d Network settings for room #%ld <%s>\n",
                LISTING_FOLLOWS,
                CC->quickroom.QRnumber, CC->quickroom.QRname);
@@ -348,7 +348,7 @@ void cmd_snet(char *argbuf) {
 
        if (CtdlAccessCheck(ac_room_aide)) return;
        safestrncpy(tempfilename, tmpnam(NULL), sizeof tempfilename);
-       assoc_file_name(filename, &CC->quickroom, "netconfigs");
+       assoc_file_name(filename, sizeof filename, &CC->quickroom, "netconfigs");
 
        fp = fopen(tempfilename, "w");
        if (fp == NULL) {
@@ -571,7 +571,7 @@ void network_spoolout_room(char *room_to_spool) {
        }
 
        memset(&sc, 0, sizeof(struct SpoolControl));
-       assoc_file_name(filename, &CC->quickroom, "netconfigs");
+       assoc_file_name(filename, sizeof filename, &CC->quickroom, "netconfigs");
 
        fp = fopen(filename, "r");
        if (fp == NULL) {
@@ -718,8 +718,8 @@ void network_bounce(struct CtdlMessage *msg, char *reason) {
        if (msg->cm_fields['I'] != NULL) {
                phree(msg->cm_fields['I']);
        }
-       sprintf(buf, "%ld.%04x.%04x@%s",
-               (long)time(NULL), getpid(), ++serialnum, config.c_fqdn);
+       sprintf(buf, "%ld.%04lx.%04x@%s",
+               (long)time(NULL), (long)getpid(), ++serialnum, config.c_fqdn);
        msg->cm_fields['I'] = strdoop(buf);
 
        /*