[Fix] #37353 プロジェクトファイルとソース修正。 / Fix project file and sources.

[hengband/hengband.git] / src / z-form.c

diff --git a/src/z-form.c b/src/z-form.c
index 34367c6..b2629ba 100644 (file)
--- a/src/z-form.c
+++ b/src/z-form.c
@@ -11,7 +11,6 @@
 /* Purpose: Low level text formatting -BEN- */
 
 #include "z-form.h"
-
 #include "z-util.h"
 #include "z-virt.h"
 
@@ -282,8 +281,6 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp)
 
                        /* Save the character */
                        buf[n++] = *s++;
-
-                       /* Continue */
                        continue;
                }
 
@@ -301,8 +298,6 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp)
 
                        /* Skip the "%" */
                        s++;
-
-                       /* Continue */
                        continue;
                }
 
@@ -319,8 +314,6 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp)
 
                        /* Skip the "n" */
                        s++;
-
-                       /* Continue */
                        continue;
                }
 
@@ -332,8 +325,6 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp)
 
                        /* Skip the "r" */
                        s++;
-
-                       /* Continue */
                        continue;
                }
 
@@ -468,7 +459,6 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp)
                                /* Format the argument */
                                sprintf(tmp, "%c", arg);
 
-                               /* Done */
                                break;
                        }
 
@@ -483,7 +473,7 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp)
                                        arg = va_arg(vp, long);
 
                                        /* Format the argument */
-                                       sprintf(tmp, "%ld", arg);
+                                       sprintf(tmp, aux, arg);
                                }
                                else
                                {
@@ -493,10 +483,9 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp)
                                        arg = va_arg(vp, int);
 
                                        /* Format the argument */
-                                       sprintf(tmp, "%d", arg);
+                                       sprintf(tmp, aux, arg);
                                }
 
-                               /* Done */
                                break;
                        }
 
@@ -510,26 +499,7 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp)
                                        /* Access next argument */
                                        arg = va_arg(vp, unsigned long);
 
-                                       /* Format the argument */
-                                       switch (aux[q-1])
-                                       {
-                                               case 'u':
-                                                       sprintf(tmp, "%lu", arg);
-                                                       break;
-                                               case 'o':
-                                                       sprintf(tmp, "%lo", arg);
-                                                       break;
-                                               case 'x':
-                                                       sprintf(tmp, "%lx", arg);
-                                                       break;
-                                               case 'X':
-                                                       sprintf(tmp, "%lX", arg);
-                                                       break;
-                                               default:
-                                                       sprintf(tmp, "");
-                                                       break;
-                                       }
-
+                                       sprintf(tmp, aux, arg);
                                }
                                else
                                {
@@ -537,29 +507,10 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp)
 
                                        /* Access next argument */
                                        arg = va_arg(vp, unsigned int);
+                                       sprintf(tmp, aux, arg);
 
-                                       /* Format the argument */
-                                       switch (aux[q - 1])
-                                       {
-                                       case 'u':
-                                               sprintf(tmp, "%u", arg);
-                                               break;
-                                       case 'o':
-                                               sprintf(tmp, "%o", arg);
-                                               break;
-                                       case 'x':
-                                               sprintf(tmp, "%x", arg);
-                                               break;
-                                       case 'X':
-                                               sprintf(tmp, "%X", arg);
-                                               break;
-                                       default:
-                                               sprintf(tmp, "");
-                                               break;
-                                       }
                                }
 
-                               /* Done */
                                break;
                        }
 
@@ -574,29 +525,8 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp)
                                arg = va_arg(vp, double);
 
                                /* Format the argument */
-                               switch (aux[q - 1])
-                               {
-                               case 'f':
-                                       sprintf(tmp, "%f", arg);
-                                       break;
-                               case 'e':
-                                       sprintf(tmp, "%e", arg);
-                                       break;
-                               case 'E':
-                                       sprintf(tmp, "%E", arg);
-                                       break;
-                               case 'g':
-                                       sprintf(tmp, "%g", arg);
-                                       break;
-                               case 'G':
-                                       sprintf(tmp, "%G", arg);
-                                       break;
-                               default:
-                                       sprintf(tmp, aux, arg);
-                                       break;
-                               }
+                               sprintf(tmp, aux, arg);
 
-                               /* Done */
                                break;
                        }
 
@@ -609,9 +539,8 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp)
                                arg = va_arg(vp, vptr);
 
                                /* Format the argument */
-                               sprintf(tmp, "%p", arg);
+                               sprintf(tmp, aux, arg);
 
-                               /* Done */
                                break;
                        }
 
@@ -632,9 +561,8 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp)
                                arg2[1023] = '\0';
 
                                /* Format the argument */
-                               sprintf(tmp, "%s", arg2);
+                               sprintf(tmp, aux, arg);
 
-                               /* Done */
                                break;
                        }
 
@@ -648,14 +576,12 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp)
                                arg = va_arg(vp, vptr);
 
                                /* Format the "user data" */
-                               (void)vstrnfmt_aux(tmp, 1000, aux[q-1] == 'V' ? "%V" : "%v", arg);
+                               sprintf(tmp, aux, arg);
 
-                               /* Done */
                                break;
                        }
 
 
-                       /* Oops */
                        default:
                        {
                                /* Error -- illegal format char */
@@ -683,7 +609,6 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp)
                                        if (islower(tmp[q]))
                                                tmp[q] = (char)toupper(tmp[q]);
 
-                                       /* Done */
                                        break;
                                }
                        }