Difference for common/arch.c from version 1.27 to 1.28


version 1.27 version 1.28
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_arch_c =   * static char *rcsid_arch_c =
  *   "$Id: arch.c,v 1.27 2003/09/23 04:45:36 mwedel Exp $";   *   "$Id: arch.c,v 1.28 2003/10/09 07:21:03 mwedel Exp $";
  */   */
   
 /*  /*
Line 211
 
Line 211
   
  if (!cp || cp[0]=='\0' || count<0) return 0;   if (!cp || cp[0]=='\0' || count<0) return 0;
   
  /* base name matched - not bad */  
  if (strcasecmp(cp,op->name)==0 && !count) return 4;   /* The code here should go from highest retval to lowest.  That
   else if (op->custom_name && strcasecmp(cp,op->custom_name)==0) {   * is because of the 'else' handling - we don't want to match on
     pl->contr->count=count; /* May not do anything */   * something and set a low retval, even though it may match a higher retcal
     /* Return 5 so custom name has higher priority than normal name */   * later.  So keep it in descending order here, so we try for the best
     return 5;   * match first, and work downward.
   }   */
   
  else if (count>1) { /* Need to plurify name for proper match */  
      if (!strcasecmp(cp,op->name_pl)) {  
  pl->contr->count=count; /* May not do anything */  
  return 6;  
      }  
  }  
  else if (count==1) {  
      if (!strcasecmp(op->name,cp)) {  
  pl->contr->count=count; /* May not do anything */  
  return 6;  
      }  
  }  
  if (!strcasecmp(cp,query_name(op))) retval=20;   if (!strcasecmp(cp,query_name(op))) retval=20;
  else if (!strcasecmp(cp,query_short_name(op))) retval=18;   else if (!strcasecmp(cp,query_short_name(op))) retval=18;
  else if (!strcasecmp(cp,query_base_name(op,0))) retval=16;   else if (!strcasecmp(cp,query_base_name(op,0))) retval=16;
  else if (!strcasecmp(cp,query_base_name(op,1))) retval=16;   else if (!strcasecmp(cp,query_base_name(op,1))) retval=16;
    else if (op->custom_name && !strcasecmp(cp,op->custom_name)) retval=15;
  else if (!strncasecmp(cp,query_base_name(op,0),   else if (!strncasecmp(cp,query_base_name(op,0),
        MIN(strlen(cp),strlen(query_base_name(op,0))))) retval=14;         MIN(strlen(cp),strlen(query_base_name(op,0))))) retval=14;
  else if (!strncasecmp(cp,query_base_name(op,1),   else if (!strncasecmp(cp,query_base_name(op,1),
Line 248
 
Line 236
  else if (strstr(query_base_name(op,1), cp)) retval = 12;   else if (strstr(query_base_name(op,1), cp)) retval = 12;
  else if (strstr(query_base_name(op,0), cp)) retval = 12;   else if (strstr(query_base_name(op,0), cp)) retval = 12;
  else if (strstr(query_short_name(op), cp)) retval = 12;   else if (strstr(query_short_name(op), cp)) retval = 12;
   
    /* Check against plural/non plural based on count. */
    else if (count>1 && !strcasecmp(cp,op->name_pl)) {
    retval=6;
    }
    else if (count==1 && !strcasecmp(op->name,cp)) {
    retval=6;
    }
    /* base name matched - not bad */
    else if (strcasecmp(cp,op->name)==0 && !count) retval=4;
  /* Check for partial custom name, but give a real low priority */   /* Check for partial custom name, but give a real low priority */
  else if (op->custom_name && strstr(op->custom_name, cp)) retval = 3;   else if (op->custom_name && strstr(op->custom_name, cp)) retval = 3;
   


Legend:
line(s) removed in v.1.27 
line(s) changed
 line(s) added in v.1.28

File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:05