WebSVN – SvarDOS – Diff – /svarcom/trunk/helpers.c

     dst[end] = 0;
+  }
+}
-/* convert an unsigned short to ASCIZ, output set to fixlen chars if fixlen
+/* convert an unsigned short to ASCIZ, output expanded to minlen chars
- * is non zero (prefixed with prefixchar if value too small, else truncated)
+ * (prefixed with prefixchar if value too small, else truncated)
  * returns length of produced string */
-unsigned short ustoa(char *dst, unsigned short n, unsigned char fixlen, char prefixchar) {
+unsigned short ustoa(char *dst, unsigned short n, unsigned char minlen, char prefixchar) {
   unsigned short r;
-  unsigned char i;
+  unsigned char i, len;
   unsigned char nonzerocharat = 5;
   for (i = 4; i != 0xff; i--) {
     r = n % 10;
     n /= 10;
   for (i = 0; i < 4; i++) {
     if (dst[i] != '0') break;
     dst[i] = prefixchar;
+  }
+  len = 5 - nonzerocharat;
-  /* apply fixlen, if set */
+  /* apply minlen, if set */
-  if ((fixlen > 0) && (fixlen < 6)) {
+  if ((minlen > len) && (minlen < 6)) {
+    len = minlen;
-    nonzerocharat = 5 - fixlen;
+    nonzerocharat = 5 - minlen;
+  }
   if (nonzerocharat != 0) {
-    memcpy_ltr(dst, dst + nonzerocharat, 5 - nonzerocharat);
+    memcpy_ltr(dst, dst + nonzerocharat, len);
+  }
-  dst[5 - nonzerocharat] = 0;
+  dst[len] = 0;
-  return(5 - nonzerocharat);
+  return(len);
+}
 /* converts an unsigned short to a four-byte ASCIZ hex string ("0ABC") */
 void ustoh(char *dst, unsigned short n) {

Subversion Repositories SvarDOS