cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c

[andya]

andya       01/06/15 04:38:25

  Modified:    jk/native/common jk_util.c
  Log:
  Refactored jk_is_path_poperty() and jk_is_cmd_line_poperty() to call a
  common helper function.
  
  Revision  Changes    Path
  1.4       +21 -20    jakarta-tomcat-connectors/jk/native/common/jk_util.c
  
  Index: jk_util.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jk_util.c 2001/06/07 14:40:50     1.3
  +++ jk_util.c 2001/06/15 11:38:23     1.4
  @@ -57,7 +57,7 @@
    * Description: Utility functions (mainly configuration)                   *
    * Author:      Henri Gomez <[EMAIL PROTECTED]>                               *
    * Author:      Gal Shachor <[EMAIL PROTECTED]>                           *
  - * Version:     $Revision: 1.3 $                                           *
  + * Version:     $Revision: 1.4 $                                           *
    ***************************************************************************/
   
   
  @@ -566,30 +566,31 @@
       }
       return JK_FALSE;
   }
  -
  +
  +static int jk_is_some_property(const char *prp_name, const char *suffix)
  +{
  +    if (prp_name && suffix) {
  +             size_t prp_name_len = strlen(prp_name);
  +             size_t suffix_len = strlen(suffix);
  +             if (prp_name_len >= suffix_len) {
  +                     const char *prp_suffix = prp_name + prp_name_len - suffix_len;
  +                     if(0 == strcmp(suffix, prp_suffix)) {
  +                     return JK_TRUE;
  +                     }
  +        }
  +    }
  +
  +    return JK_FALSE;
  +}
  +
   int jk_is_path_poperty(const char *prp_name)
  -{
  -    char *path_suffix = "path";
  -    if(prp_name && (strlen(prp_name) >= strlen(path_suffix))) {
  -        const char *suffix = prp_name + strlen(prp_name) - strlen(path_suffix);
  -        if(0 == strcmp(suffix, path_suffix)) {
  -            return JK_TRUE;
  -        }
  -    }
  -
  -    return JK_FALSE;
  +{
  +     return jk_is_some_property(prp_name, "path");
   }
   
   int jk_is_cmd_line_poperty(const char *prp_name)
   {
  -    if(prp_name && (strlen(prp_name) >= strlen(CMD_LINE_OF_WORKER))) {
  -        const char *suffix = prp_name + strlen(prp_name) - 
strlen(CMD_LINE_OF_WORKER);
  -        if(0 == strcmp(suffix, CMD_LINE_OF_WORKER)) {
  -            return JK_TRUE;
  -        }
  -    }
  -
  -    return JK_FALSE;
  +     return jk_is_some_property(prp_name, CMD_LINE_OF_WORKER);
   }
   
   int jk_get_worker_stdout(jk_map_t *m,