* conf/autofs/autofs_solaris_v2_v3.c (autofs_lookup_2_req)

conf/autofs/autofs_solaris_v1.c (autofs_mount_1_req), amd/opts.c,
amd/nfs_subr.c (nfsproc_lookup_2_svc), amd/nfs_start.c
(mount_automounter), amd/get_args.c (get_args), amd/amfs_toplvl.c,
amd/amfs_auto.c (amfs_auto_mount), amd/amd.h, amd/amd.c (main):
use sizeof() instead of fixed SIZEOF_* macros.

diff --git a/ChangeLog b/ChangeLog
index 7b3e25be45cc3eda4e4b944df1d73f0b31cc48d3..d950e65c42899618c39670c41fb9c0ebb6544eff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-10-06  Erez Zadok  <ezk@cs.sunysb.edu>
 
+       * conf/autofs/autofs_solaris_v2_v3.c (autofs_lookup_2_req)
+       conf/autofs/autofs_solaris_v1.c (autofs_mount_1_req), amd/opts.c,
+       amd/nfs_subr.c (nfsproc_lookup_2_svc), amd/nfs_start.c
+       (mount_automounter), amd/get_args.c (get_args), amd/amfs_toplvl.c,
+       amd/amfs_auto.c (amfs_auto_mount), amd/amd.h, amd/amd.c (main):
+       use sizeof() instead of fixed SIZEOF_* macros.
+
        * libamu/strutil.c (xstrlcat, xstrlcpy), include/am_utils.h
        (DEBUG): if debugging is on, then also print the source file name
        and line number that called xstrl* with a buffer that wasn't large

diff --git a/amd/amd.c b/amd/amd.c
index 42e7a69c61b6c4666607a4f2b9953c041d33ce1d..fa8f831362b2698b5286b5b380efc2fb70e24e4c 100644 (file)
--- a/amd/amd.c
+++ b/amd/amd.c
@@ -456,7 +456,7 @@ main(int argc, char *argv[])
     *domdot++ = '\0';
     hostdomain = domdot;
   }
-  xstrlcpy(hostd, hostname, SIZEOF_HOSTD);
+  xstrlcpy(hostd, hostname, sizeof(hostd));
   am_set_hostname(hostname);
 
   /*

diff --git a/amd/amd.h b/amd/amd.h
index b4c70f9d2a4272854ebd43c4cca62f38bd71ed3a..e0eaef50ffd7a88bd9bc30ba02f4a4473eb82df2 100644 (file)
--- a/amd/amd.h
+++ b/amd/amd.h
@@ -637,8 +637,8 @@ extern SVCXPRT *current_transp; /* For nfs_quick_reply() */
 extern char *conf_tag;
 #define SIZEOF_UID_STR 12
 #define SIZEOF_GID_STR 12
-extern char *opt_gid;
-extern char *opt_uid;
+extern char *opt_gid, gid_str[SIZEOF_GID_STR];
+extern char *opt_uid, uid_str[SIZEOF_UID_STR];
 extern int NumChildren;
 extern int fwd_sock;
 extern int select_intr_valid;

diff --git a/amd/amfs_auto.c b/amd/amfs_auto.c
index 3589cbd033b01f3ffc7323faa526280a6406800c..92be82722282508686f3491c9ae0f603b1673f6b 100644 (file)
--- a/amd/amfs_auto.c
+++ b/amd/amfs_auto.c
@@ -155,7 +155,7 @@ amfs_auto_mount(am_node *mp, mntfs *mf)
     char opts[SIZEOF_OPTS];
     int error;
 
-    autofs_get_opts(opts, SIZEOF_OPTS, mp->am_autofs_fh);
+    autofs_get_opts(opts, sizeof(opts), mp->am_autofs_fh);
 
     /* now do the mount */
     error = amfs_mount(mp, mf, opts);

diff --git a/amd/amfs_toplvl.c b/amd/amfs_toplvl.c
index 0ad29575256b18a6e626d77f61f96fe06a564766..c02b013baf2035b970b7f983852c68576409bab3 100644 (file)
--- a/amd/amfs_toplvl.c
+++ b/amd/amfs_toplvl.c
@@ -195,23 +195,23 @@ amfs_toplvl_mount(am_node *mp, mntfs *mf)
 
 #ifdef HAVE_FS_AUTOFS
   if (mf->mf_flags & MFF_IS_AUTOFS) {
-    autofs_get_opts(opts, SIZEOF_OPTS, mp->am_autofs_fh);
+    autofs_get_opts(opts, sizeof(opts), mp->am_autofs_fh);
   } else
 #endif /* HAVE_FS_AUTOFS */
   {
     preopts[0] = '\0';
 #ifdef MNTTAB_OPT_INTR
-    xstrlcat(preopts, MNTTAB_OPT_INTR, SIZEOF_OPTS);
-    xstrlcat(preopts, ",", SIZEOF_OPTS);
+    xstrlcat(preopts, MNTTAB_OPT_INTR, sizeof(preopts));
+    xstrlcat(preopts, ",", sizeof(preopts));
 #endif /* MNTTAB_OPT_INTR */
 #ifdef MNTTAB_OPT_IGNORE
-    xstrlcat(preopts, MNTTAB_OPT_IGNORE, SIZEOF_OPTS);
-    xstrlcat(preopts, ",", SIZEOF_OPTS);
+    xstrlcat(preopts, MNTTAB_OPT_IGNORE, sizeof(preopts));
+    xstrlcat(preopts, ",", sizeof(preopts));
 #endif /* MNTTAB_OPT_IGNORE */
 #ifdef WANT_TIMEO_AND_RETRANS_ON_TOPLVL
-    xsnprintf(opts, SIZEOF_OPTS, "%s%s,%s=%d,%s=%d,%s=%d,%s,map=%s",
+    xsnprintf(opts, sizeof(opts), "%s%s,%s=%d,%s=%d,%s=%d,%s,map=%s",
 #else /* WANT_TIMEO_AND_RETRANS_ON_TOPLVL */
-    xsnprintf(opts, SIZEOF_OPTS, "%s%s,%s=%d,%s,map=%s",
+    xsnprintf(opts, sizeof(opts), "%s%s,%s=%d,%s,map=%s",
 #endif /* WANT_TIMEO_AND_RETRANS_ON_TOPLVL */
              preopts,
              MNTTAB_OPT_RW,
@@ -224,11 +224,11 @@ amfs_toplvl_mount(am_node *mp, mntfs *mf)
              mf->mf_ops->fs_type, mf->mf_info);
 #ifdef MNTTAB_OPT_NOAC
     if (gopt.auto_attrcache == 0) {
-      xstrlcat(opts, ",", SIZEOF_OPTS);
-      xstrlcat(opts, MNTTAB_OPT_NOAC, SIZEOF_OPTS);
+      xstrlcat(opts, ",", sizeof(opts));
+      xstrlcat(opts, MNTTAB_OPT_NOAC, sizeof(opts));
     } else
 #endif /* MNTTAB_OPT_NOAC */
-      set_auto_attrcache_timeout(preopts, opts, SIZEOF_OPTS);
+      set_auto_attrcache_timeout(preopts, opts, sizeof(preopts));
   }
 
   /* now do the mount */

diff --git a/amd/get_args.c b/amd/get_args.c
index 11a3696aa513f51d9c71a0f734eaaa5b4c25c4d5..93a4736b7da03774235d283f313378b55eace5c8 100644 (file)
--- a/amd/get_args.c
+++ b/amd/get_args.c
@@ -382,8 +382,8 @@ get_args(int argc, char *argv[])
       hostdomain = gopt.sub_domain;
     if (*hostdomain == '.')
       hostdomain++;
-    xstrlcat(hostd, ".", SIZEOF_HOSTD);
-    xstrlcat(hostd, hostdomain, SIZEOF_HOSTD);
+    xstrlcat(hostd, ".", sizeof(hostd));
+    xstrlcat(hostd, hostdomain, sizeof(hostd));
 
 #ifdef MOUNT_TABLE_ON_FILE
     if (amuDebug(D_MTAB))

diff --git a/amd/nfs_start.c b/amd/nfs_start.c
index 00ab82589ad4a13ea370a496f833dbb2220eab26..17303bccbb4f59a79f9618b85926f8dc24d4ca57 100644 (file)
--- a/amd/nfs_start.c
+++ b/amd/nfs_start.c
@@ -368,7 +368,7 @@ mount_automounter(int ppid)
     if (ret != 0)
       return ret;
   }
-  xsnprintf(pid_fsname, SIZEOF_PID_FSNAME, "%s:(pid%ld,port%u)",
+  xsnprintf(pid_fsname, sizeof(pid_fsname), "%s:(pid%ld,port%u)",
            am_get_hostname(), (long) am_mypid, nfs_port);
 
   /* security: if user sets -D noamq, don't even create listening socket */

diff --git a/amd/nfs_subr.c b/amd/nfs_subr.c
index 8cb8031fcd9206ed7a39389461c35df60288c298..9f6486b3651677259729507ca717fd4e1051d3fb 100644 (file)
--- a/amd/nfs_subr.c
+++ b/amd/nfs_subr.c
@@ -205,8 +205,8 @@ nfsproc_lookup_2_svc(nfsdiropargs *argp, struct svc_req *rqstp)
   /* finally, find the effective uid/gid from RPC request */
   if (getcreds(rqstp, &uid, &gid, nfsxprt) < 0)
     plog(XLOG_ERROR, "cannot get uid/gid from RPC credentials");
-  xsnprintf(opt_uid, SIZEOF_UID_STR, "%d", (int) uid);
-  xsnprintf(opt_gid, SIZEOF_GID_STR, "%d", (int) gid);
+  xsnprintf(opt_uid, sizeof(uid_str), "%d", (int) uid);
+  xsnprintf(opt_gid, sizeof(gid_str), "%d", (int) gid);
 
   mp = fh_to_mp3(&argp->da_fhandle, &retry, VLOOK_CREATE);
   if (mp == NULL) {

diff --git a/amd/opts.c b/amd/opts.c
index 6773e700edca927367da0d50ca9aca3860e40406..49b874d9bcf6504ab74b28fae254d503bb3beef7 100644 (file)
--- a/amd/opts.c
+++ b/amd/opts.c
@@ -113,7 +113,7 @@ static char *opt_key = nullstr;
 static char *opt_keyd = nullstr;
 static char *opt_map = nullstr;
 static char *opt_path = nullstr;
-static char uid_str[SIZEOF_UID_STR], gid_str[SIZEOF_GID_STR];
+char uid_str[SIZEOF_UID_STR], gid_str[SIZEOF_GID_STR];
 char *opt_uid = uid_str;
 char *opt_gid = gid_str;
 static char *vars[8];

diff --git a/conf/autofs/autofs_solaris_v1.c b/conf/autofs/autofs_solaris_v1.c
index 3a3e22fdc0f4ac7f47e3997d2b971307c430db53..eb3e5e7dc4aed8fca2c45c59c88d5a2e47f9fcb9 100644 (file)
--- a/conf/autofs/autofs_solaris_v1.c
+++ b/conf/autofs/autofs_solaris_v1.c
@@ -195,8 +195,8 @@ autofs_mount_1_req(struct mntrequest *m,
        m->name, m->map, m->opts, m->path);
 
   /* find the effective uid/gid from RPC request */
-  xsnprintf(opt_uid, SIZEOF_UID_STR, "%d", (int) cred->aup_uid);
-  xsnprintf(opt_gid, SIZEOF_GID_STR, "%d", (int) cred->aup_gid);
+  xsnprintf(opt_uid, sizeof(uid_str), "%d", (int) cred->aup_uid);
+  xsnprintf(opt_gid, sizeof(gid_str), "%d", (int) cred->aup_gid);
 
   mp = find_ap(m->path);
   if (!mp) {

diff --git a/conf/autofs/autofs_solaris_v2_v3.c b/conf/autofs/autofs_solaris_v2_v3.c
index c6e26a6adaf51cfaea5d6ca30a502495ef40e579..78c2714fbdbd1244c0c13799a328e4fd0f27f4c3 100644 (file)
--- a/conf/autofs/autofs_solaris_v2_v3.c
+++ b/conf/autofs/autofs_solaris_v2_v3.c
@@ -488,8 +488,8 @@ autofs_lookup_2_req(autofs_lookupargs *m,
        m->path, m->isdirect);
 
   /* find the effective uid/gid from RPC request */
-  xsnprintf(opt_uid, SIZEOF_UID_STR, "%d", (int) cred->aup_uid);
-  xsnprintf(opt_gid, SIZEOF_GID_STR, "%d", (int) cred->aup_gid);
+  xsnprintf(opt_uid, sizeof(uid_str), "%d", (int) cred->aup_uid);
+  xsnprintf(opt_gid, sizeof(gid_str), "%d", (int) cred->aup_gid);
 
   mp = find_ap(m->path);
   if (!mp) {
@@ -556,8 +556,8 @@ autofs_mount_2_req(autofs_lookupargs *m,
        m->path, m->isdirect);
 
   /* find the effective uid/gid from RPC request */
-  xsnprintf(opt_uid, SIZEOF_UID_STR, "%d", (int) cred->aup_uid);
-  xsnprintf(opt_gid, SIZEOF_GID_STR, "%d", (int) cred->aup_gid);
+  xsnprintf(opt_uid, sizeof(uid_str), "%d", (int) cred->aup_uid);
+  xsnprintf(opt_gid, sizeof(gid_str), "%d", (int) cred->aup_gid);
 
   mp = find_ap(m->path);
   if (!mp) {