Module Name: src
Committed By: christos
Date: Sat Apr 7 16:16:34 UTC 2012
Modified Files:
src/lib/libutil: login_cap.c
Log Message:
- pass correct types.
- use sizeof(var) instead of sizeof(type)
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/lib/libutil/login_cap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libutil/login_cap.c
diff -u src/lib/libutil/login_cap.c:1.29 src/lib/libutil/login_cap.c:1.30
--- src/lib/libutil/login_cap.c:1.29 Tue Dec 4 17:09:02 2007
+++ src/lib/libutil/login_cap.c Sat Apr 7 12:16:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: login_cap.c,v 1.29 2007/12/04 22:09:02 mjf Exp $ */
+/* $NetBSD: login_cap.c,v 1.30 2012/04/07 16:16:34 christos Exp $ */
/*-
* Copyright (c) 1995,1997 Berkeley Software Design, Inc. All rights reserved.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: login_cap.c,v 1.29 2007/12/04 22:09:02 mjf Exp $");
+__RCSID("$NetBSD: login_cap.c,v 1.30 2012/04/07 16:16:34 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -444,25 +444,25 @@ gsetrl(login_cap_t *lc, int what, const
return (-1);
}
-#define RCUR r.rlim_cur
-#define RMAX r.rlim_max
+#define RCUR ((quad_t)r.rlim_cur)
+#define RMAX ((quad_t)r.rlim_max)
switch (type) {
case R_CTIME:
- RCUR = login_getcaptime(lc, name, RCUR, RCUR);
- RMAX = login_getcaptime(lc, name, RMAX, RMAX);
+ r.rlim_cur = login_getcaptime(lc, name, RCUR, RCUR);
+ r.rlim_max = login_getcaptime(lc, name, RMAX, RMAX);
rl.rlim_cur = login_getcaptime(lc, name_cur, RCUR, RCUR);
rl.rlim_max = login_getcaptime(lc, name_max, RMAX, RMAX);
break;
case R_CSIZE:
- RCUR = login_getcapsize(lc, name, RCUR, RCUR);
- RMAX = login_getcapsize(lc, name, RMAX, RMAX);
+ r.rlim_cur = login_getcapsize(lc, name, RCUR, RCUR);
+ r.rlim_max = login_getcapsize(lc, name, RMAX, RMAX);
rl.rlim_cur = login_getcapsize(lc, name_cur, RCUR, RCUR);
rl.rlim_max = login_getcapsize(lc, name_max, RMAX, RMAX);
break;
case R_CNUMB:
- RCUR = login_getcapnum(lc, name, RCUR, RCUR);
- RMAX = login_getcapnum(lc, name, RMAX, RMAX);
+ r.rlim_cur = login_getcapnum(lc, name, RCUR, RCUR);
+ r.rlim_max = login_getcapnum(lc, name, RMAX, RMAX);
rl.rlim_cur = login_getcapnum(lc, name_cur, RCUR, RCUR);
rl.rlim_max = login_getcapnum(lc, name_max, RMAX, RMAX);
break;
@@ -513,7 +513,7 @@ setuserenv(login_cap_t *lc, envfunc_t se
/* allocate ptr array and string */
count = i;
- res = malloc(count * sizeof(char *) + strlen(str) + 1);
+ res = malloc(count * sizeof(*res) + strlen(str) + 1);
if (!res)
return -1;
