From fe26b7c09f86650d19b4be388c155af081388a67 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Tue, 9 Apr 2002 23:28:19 +0000 Subject: portability fix: snprintf -> g_snprintf --- mixlib/mix_predicate.c | 18 +++++++++--------- mixlib/mix_vm_command.c | 6 +++--- mixlib/xmix_vm_command.c | 6 +++--- mixlib/xmix_vm_handlers.c | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) (limited to 'mixlib') diff --git a/mixlib/mix_predicate.c b/mixlib/mix_predicate.c index 1406ef5..1ca2bd5 100644 --- a/mixlib/mix_predicate.c +++ b/mixlib/mix_predicate.c @@ -1,9 +1,9 @@ /* -*-c-*- -------------- mix_predicate.c : * Implementation of the functions declared in mix_predicate.h * ------------------------------------------------------------------ - * $Id: mix_predicate.c,v 1.3 2001/09/16 22:28:41 jao Exp $ + * $Id: mix_predicate.c,v 1.4 2002/04/09 23:28:19 jao Exp $ * ------------------------------------------------------------------ - * Copyright (C) 2001 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -173,36 +173,36 @@ mix_predicate_get_message (const mix_predicate_t *predicate) switch (predicate->type) { case MIX_PRED_REG_A: - snprintf (BUFFER, SIZE, "Register A changed to %s%ld", + g_snprintf (BUFFER, SIZE, "Register A changed to %s%ld", mix_word_is_negative (predicate->data.regA)? "-" : "+", mix_word_magnitude (predicate->data.regA)); break; case MIX_PRED_REG_X: - snprintf (BUFFER, SIZE, "Register X changed to %s%ld", + g_snprintf (BUFFER, SIZE, "Register X changed to %s%ld", mix_word_is_negative (predicate->data.regX)? "-" : "+", mix_word_magnitude (predicate->data.regX)); break; case MIX_PRED_REG_J: - snprintf (BUFFER, SIZE, "Register J changed to %d", + g_snprintf (BUFFER, SIZE, "Register J changed to %d", mix_short_magnitude (predicate->data.regI)); break; case MIX_PRED_REG_I1: case MIX_PRED_REG_I2: case MIX_PRED_REG_I3: case MIX_PRED_REG_I4: case MIX_PRED_REG_I5: case MIX_PRED_REG_I6: - snprintf (BUFFER, SIZE, "Register I%d changed to %s%d", + g_snprintf (BUFFER, SIZE, "Register I%d changed to %s%d", predicate->control, mix_short_is_negative (predicate->data.regI)? "-" : "+", mix_short_magnitude (predicate->data.regI)); break; case MIX_PRED_CMP: - snprintf (BUFFER, SIZE, "Comparison flag changed to %s", + g_snprintf (BUFFER, SIZE, "Comparison flag changed to %s", CMP_STRINGS[predicate->data.cmp]); break; case MIX_PRED_OVER: - snprintf (BUFFER, SIZE, "Overflow toggled %s", + g_snprintf (BUFFER, SIZE, "Overflow toggled %s", predicate->data.over ? "ON" : "OFF"); break; case MIX_PRED_MEM: - snprintf (BUFFER, SIZE, "Memory address %d changed to %s%ld", + g_snprintf (BUFFER, SIZE, "Memory address %d changed to %s%ld", predicate->control, mix_word_is_negative (predicate->data.mem)? "-" : "+", mix_word_magnitude (predicate->data.mem)); diff --git a/mixlib/mix_vm_command.c b/mixlib/mix_vm_command.c index 77005e5..81e0bb6 100644 --- a/mixlib/mix_vm_command.c +++ b/mixlib/mix_vm_command.c @@ -1,9 +1,9 @@ /* -*-c-*- -------------- mix_vm_command.c : * Implementation of the functions declared in mix_vm_command.h * ------------------------------------------------------------------ - * $Id: mix_vm_command.c,v 1.26 2001/09/16 22:32:12 jao Exp $ + * $Id: mix_vm_command.c,v 1.27 2002/04/09 23:28:19 jao Exp $ * ------------------------------------------------------------------ - * Copyright (C) 2001 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -631,7 +631,7 @@ mix_vm_cmd_dispatcher_get_src_file_line (const mix_vm_cmd_dispatcher_t *dis, enum {BUFF_SIZE = 256}; static gchar BUFFER[BUFF_SIZE]; int len = - snprintf (BUFFER, BUFF_SIZE, "%s", mix_src_file_get_line (file, line)); + g_snprintf (BUFFER, BUFF_SIZE, "%s", mix_src_file_get_line (file, line)); if (len > 0 && BUFFER[len - 1] == '\n') BUFFER[len - 1] = '\0'; return BUFFER; } diff --git a/mixlib/xmix_vm_command.c b/mixlib/xmix_vm_command.c index 32acc92..211c1bf 100644 --- a/mixlib/xmix_vm_command.c +++ b/mixlib/xmix_vm_command.c @@ -1,9 +1,9 @@ /* -*-c-*- -------------- xmix_vm_command.c : * Implementation of the functions declared in xmix_vm_command.h * ------------------------------------------------------------------ - * Last change: Time-stamp: "01/08/26 15:27:53 jao" + * $Id: xmix_vm_command.c,v 1.3 2002/04/09 23:28:19 jao Exp $ * ------------------------------------------------------------------ - * Copyright (C) 2001 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -57,7 +57,7 @@ log_error_ (mix_vm_cmd_dispatcher_t *dis, const gchar *fmt, ...) { va_list args; va_start (args, fmt); - snprintf (BUFFER, BUFF_SIZE, "ERROR: %s\n", fmt); + g_snprintf (BUFFER, BUFF_SIZE, "ERROR: %s\n", fmt); vfprintf (dis->err, BUFFER, args); va_end (args); } diff --git a/mixlib/xmix_vm_handlers.c b/mixlib/xmix_vm_handlers.c index 2938bfc..e5bf909 100644 --- a/mixlib/xmix_vm_handlers.c +++ b/mixlib/xmix_vm_handlers.c @@ -1,9 +1,9 @@ /* -*-c-*- -------------- xmix_vm_handlers.c : * Implementation of the functions declared in xmix_vm_handlers.h * ------------------------------------------------------------------ - * $Id: xmix_vm_handlers.c,v 1.4 2001/09/17 23:26:43 jao Exp $ + * $Id: xmix_vm_handlers.c,v 1.5 2002/04/09 23:28:19 jao Exp $ * ------------------------------------------------------------------ - * Copyright (C) 2001 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1274,11 +1274,11 @@ cmd_pbt_ (mix_vm_cmd_dispatcher_t *dis, const gchar *arg) if (line && file) { int j = 0; - snprintf (BUFFER, SIZE, "%s", mix_src_file_get_line (file, line)); + g_snprintf (BUFFER, SIZE, "%s", mix_src_file_get_line (file, line)); while (!isspace (BUFFER[j])) j++; BUFFER[j] = '\0'; } - if (strlen (BUFFER) == 0) snprintf (BUFFER, SIZE, "%d", address); + if (strlen (BUFFER) == 0) g_snprintf (BUFFER, SIZE, "%d", address); fprintf (dis->out, "#%d\t%s\tin %s%s:%d\n", k, BUFFER, name, MIX_SRC_DEFEXT, line); ++k; -- cgit v1.2.3