cvs commit: apache-2.0/src/modules/standard mod_imap.c

[be...@locus.apache.org]

ben         00/06/20 13:50:06

  Modified:    src/modules/standard mod_imap.c
  Log:
  Fix warnings.
  
  Revision  Changes    Path
  1.16      +3 -3      apache-2.0/src/modules/standard/mod_imap.c
  
  Index: mod_imap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_imap.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- mod_imap.c	2000/06/20 11:31:54	1.15
  +++ mod_imap.c	2000/06/20 20:50:04	1.16
  @@ -288,14 +288,14 @@
   static double get_y_coord(const char *args)
   {
       char *endptr;               /* we want it non-null */
  -    char *start_of_y = NULL;
  +    const char *start_of_y = NULL;
       double y_coord = -1;        /* -1 is returned on error */
   
       if (args == NULL) {
           return (-1);            /* in case we aren't passed anything */
       }
   
  -    start_of_y = strchr(args, ',');     /* the comma */
  +    start_of_y = ap_strchr_c(args, ',');     /* the comma */
   
       if (start_of_y) {
   
  @@ -411,7 +411,7 @@
       }
   
       /* must be a relative URL to be combined with base */
  -    if (strchr(base, '/') == NULL && (!strncmp(value, "../", 3)
  +    if (ap_strchr_c(base, '/') == NULL && (!strncmp(value, "../", 3)
           || !strcmp(value, ".."))) {
           ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
                       "invalid base directive in map file: %s", r->uri);