--- freem/src/transact.c 2025/04/09 19:52:02 1.7 +++ freem/src/transact.c 2025/04/13 04:22:43 1.9 @@ -1,5 +1,5 @@ /* - * $Id: transact.c,v 1.7 2025/04/09 19:52:02 snw Exp $ + * $Id: transact.c,v 1.9 2025/04/13 04:22:43 snw Exp $ * FreeM transaction processing support * * @@ -24,6 +24,12 @@ * along with FreeM. If not, see . * * $Log: transact.c,v $ + * Revision 1.9 2025/04/13 04:22:43 snw + * Fix snprintf calls + * + * Revision 1.8 2025/04/10 01:24:39 snw + * Remove C++ style comments + * * Revision 1.7 2025/04/09 19:52:02 snw * Eliminate as many warnings as possible while building with -Wall * @@ -120,14 +126,14 @@ short tp_get_sem(void) char msgbuf[100]; - snprintf (msgbuf, 99, "tp_get_sem: process %d attempting to acquire transaction processing semaphore", pid); + snprintf (msgbuf, sizeof (msgbuf) - 1, "tp_get_sem: process %d attempting to acquire transaction processing semaphore", pid); m_log (1, msgbuf); /* our process already owns the semaphore */ if (shm_config->hdr->tp_owner == pid) { - snprintf (msgbuf, 99, "tp_get_sem: process %d increments transaction processing semaphore counter", pid); + snprintf (msgbuf, sizeof (msgbuf) - 1, "tp_get_sem: process %d increments transaction processing semaphore counter", pid); m_log (1, msgbuf); @@ -152,7 +158,7 @@ short tp_get_sem(void) shm_config->hdr->tp_owner = pid; shm_config->hdr->tp_semctr = 1; - snprintf (msgbuf, 99, "tp_get_sem: process %d takes transaction processing semaphore", pid); + snprintf (msgbuf, sizeof (msgbuf) - 1, "tp_get_sem: process %d takes transaction processing semaphore", pid); m_log (1, msgbuf); @@ -163,7 +169,7 @@ short tp_get_sem(void) return TRUE; } - snprintf (msgbuf, 99, "tp_get_sem: process %d attempting to acquire transaction processing semaphore (tries = %d)", pid, tries); + snprintf (msgbuf, sizeof (msgbuf) - 1, "tp_get_sem: process %d attempting to acquire transaction processing semaphore (tries = %d)", pid, tries); m_log (1, msgbuf); @@ -197,7 +203,7 @@ void tp_release_sem(void) } - snprintf (msgbuf, 99, "tp_get_sem: process %d releases transaction processing semaphore", pid); + snprintf (msgbuf, sizeof (msgbuf) - 1, "tp_get_sem: process %d releases transaction processing semaphore", pid); m_log (1, msgbuf); @@ -210,7 +216,7 @@ void tp_release_sem(void) fprintf (stderr, "tp_release_sem: daemon process decrements critical section counter\r\n"); } - snprintf (msgbuf, 99, "tp_get_sem: process %d decrements transaction processing semaphore counter", pid); + snprintf (msgbuf, sizeof (msgbuf) - 1, "tp_get_sem: process %d decrements transaction processing semaphore counter", pid); m_log (1, msgbuf); shm_config->hdr->tp_semctr--; @@ -224,7 +230,7 @@ int tp_tstart(char *tp_id, short serial, if (tp_level == TP_MAX_NEST) { char m[256]; - snprintf (m, 256, "Attempt to exceed TP_MAX_NEST. Transaction aborted.\r\n\201"); + snprintf (m, sizeof (m) - 1, "Attempt to exceed TP_MAX_NEST. Transaction aborted.\r\n\201"); write_m (m); return FALSE; @@ -269,7 +275,7 @@ int tp_add_op(short islock, short action if (transactions[tp_level].opcount == TP_MAX_OPS) { char m[256]; - snprintf (m, 256, "Attempt to exceed TP_MAX_OPS at transaction level %d. Rolling back.\r\n\201", tp_level); + snprintf (m, sizeof (m) - 1, "Attempt to exceed TP_MAX_OPS at transaction level %d. Rolling back.\r\n\201", tp_level); write_m (m); free (gr); @@ -387,7 +393,6 @@ int tp_trollback(int levels) register int i; register int j; -// for (i = 0; i < levels; i++) { for (i = tp_level; i >= (((tp_level - levels) >= 0) ? tp_level - levels : 0); i--) { for (j = 1; j <= transactions[i].opcount; j++) {