double dmax(double n1, double n2);
double dmin(double n1, double n2);
-extern s_char *numstr(s_char buf[], int n);
-extern s_char *esplur(int n);
-extern s_char *splur(int n);
-extern s_char *iesplur(int n);
-extern char *plurize(char *buf, int max_len, int n);
extern char *getstarg(char *input, char *prompt, char buf[]);
extern char *getstring(char *prompt, char buf[]);
extern char *ugetstring(char *prompt, char buf[]);
extern int ldround(double, int);
extern int roundintby(int, int);
extern int scthash(register int, register int, int);
+/* plur.c */
+extern s_char *numstr(s_char buf[], int n);
+extern s_char *esplur(int n);
+extern s_char *splur(int n);
+extern s_char *iesplur(int n);
+extern char *plurize(char *buf, int max_len, int n);
/* more in misc.h */
/*
*
*/
-#include "misc.h"
-#include "gen.h"
+#include "prototypes.h"
s_char *
splur(int n)
char *
plurize(char *buf, int max_len, int n)
{
- if (!strlen(buf) || n <= 1)
+ size_t size = strlen(buf);
+
+ if (size || n <= 1)
return buf;
- switch(buf[strlen(buf) - 1]) {
+ switch(buf[size - 1]) {
case 'y':
- buf[strlen(buf) -1] = '\0';
- strncat(buf, "ies", max_len - 1);
+ buf[size - 1] = '\0';
+ strncat(buf, "ies", max_len - size - 1);
break;
case 's':
- strncat(buf, "es", max_len - 1);
+ strncat(buf, "es", max_len - size - 1);
break;
default:
- strncat(buf, "s", max_len - 1);
+ strncat(buf, "s", max_len - size - 1);
}
return buf;
}