cvs commit: apachen/src/main util_script.c

[fielding]

fielding    97/10/15 16:37:48

  Modified:    src/main util_script.c
  Log:
  Fix warning on Solaris due to snprintf conversion of system-dependent type.
  
  Revision  Changes    Path
  1.78      +6 -4      apachen/src/main/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/util_script.c,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- util_script.c     1997/10/07 20:05:03     1.77
  +++ util_script.c     1997/10/15 23:37:47     1.78
  @@ -794,9 +794,9 @@
   
            if ((gr = getgrgid(user_gid)) == NULL) {
                if ((grpname = palloc(r->pool, 16)) == NULL)
  -                      return (pid);
  +                 return (pid);
                else
  -                 ap_snprintf(grpname, 16, "%d", user_gid);
  +                 ap_snprintf(grpname, 16, "%ld", (long) user_gid);
            }
            else
                grpname = gr->gr_name;
  @@ -804,14 +804,16 @@
        else {
            if ((pw = getpwuid(r->server->server_uid)) == NULL) {
                aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  -                   "getpwuid: invalid userid %d", r->server->server_uid);
  +                         "getpwuid: invalid userid %ld",
  +                         (long) r->server->server_uid);
                return (pid);
            }
            execuser = pstrdup(r->pool, pw->pw_name);
   
            if ((gr = getgrgid(r->server->server_gid)) == NULL) {
                aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  -                  "getgrgid: invalid groupid %d", r->server->server_gid);
  +                         "getgrgid: invalid groupid %ld",
  +                         (long) r->server->server_gid);
                return (pid);
            }
            grpname = gr->gr_name;