Now autosizing code works with const strings too.

Prototype added.
This commit is contained in:
Andrey A. Chernov 1994-11-03 00:28:05 +00:00
parent e9362258de
commit 10a42e2218
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=4102
2 changed files with 8 additions and 8 deletions

View File

@ -84,6 +84,8 @@ extern struct disklabel *avail_disklabels;
extern u_short dkcksum(struct disklabel *);
/* utils.c */
int strheight __P((const char *p));
int strwidth __P((const char *p));
void Abort __P((void));
void ExitSysinstall __P((void));
void TellEm __P((char *fmt, ...));

View File

@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
* $Id: utils.c,v 1.18 1994/11/02 08:52:15 phk Exp $
* $Id: utils.c,v 1.19 1994/11/02 22:06:24 phk Exp $
*
*/
@ -38,15 +38,13 @@ strip_trailing_newlines(char *p)
p[--len] = '\0';
}
int strwidth(char *p)
int strwidth(const char *p)
{
int i = 0, len;
char *start, *s;
const char *start, *s;
for (start = s = p; (s = strchr(s, '\n')) != NULL; start = ++s) {
*s = '\0';
len = strlen(start);
*s = '\n';
len = s - start;
if (len > i)
i = len;
}
@ -56,10 +54,10 @@ int strwidth(char *p)
return i;
}
int strheight(char *p)
int strheight(const char *p)
{
int i = 1;
char *s;
const char *s;
for (s = p; (s = strchr(s, '\n')) != NULL; s++)
i++;