cvs commit: apache/src util.c

[Brian Behlendorf]

brian       96/09/25 21:16:10

  Modified:    src       util.c
  Log:
  Reviewed by:  Brian
  Submitted by: Tom Tromey
  
  Fixed response logic which was causing warnings on Irix 6.2, among others.
  No functionality change, "else" clause was just redundant.
  
  Revision  Changes    Path
  1.20      +5 -4      apache/src/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/util.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -C3 -r1.19 -r1.20
  *** util.c    1996/09/23 20:38:53     1.19
  --- util.c    1996/09/26 04:16:06     1.20
  ***************
  *** 50,56 ****
     *
     */
    
  ! /* $Id: util.c,v 1.19 1996/09/23 20:38:53 jim Exp $ */
    
    /*
     * str.c: string utility things
  --- 50,56 ----
     *
     */
    
  ! /* $Id: util.c,v 1.20 1996/09/26 04:16:06 brian Exp $ */
    
    /*
     * str.c: string utility things
  ***************
  *** 1044,1050 ****
            fprintf(stderr,"httpd: bad user name %s\n",name);
            exit(1);
        }
  !     else return(ent->pw_uid);
    }
    
    gid_t gname2id(char *name) {
  --- 1044,1050 ----
            fprintf(stderr,"httpd: bad user name %s\n",name);
            exit(1);
        }
  !     return(ent->pw_uid);
    }
    
    gid_t gname2id(char *name) {
  ***************
  *** 1057,1063 ****
            fprintf(stderr,"httpd: bad group name %s\n",name);
            exit(1);
        }
  !     else return(ent->gr_gid);
    }
    
    #if 0
  --- 1057,1063 ----
            fprintf(stderr,"httpd: bad group name %s\n",name);
            exit(1);
        }
  !     return(ent->gr_gid);
    }
    
    #if 0
  ***************
  *** 1176,1182 ****
                    return pstrdup(a, p->h_aliases[x]);
            }
            return NULL;
  !     } else return pstrdup(a, (void *)p->h_name);
    }
    
    char *get_local_host(pool *a)
  --- 1176,1183 ----
                    return pstrdup(a, p->h_aliases[x]);
            }
            return NULL;
  !     }
  !     return pstrdup(a, (void *)p->h_name);
    }
    
    char *get_local_host(pool *a)