[BACK]Return to var.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / make

Diff for /src/usr.bin/make/var.c between version 1.27 and 1.28

version 1.27, 1999/12/18 21:58:08 version 1.28, 1999/12/19 00:04:25
Line 320 
Line 320 
      * look for it in VAR_CMD, VAR_GLOBAL and the environment, in that order,       * look for it in VAR_CMD, VAR_GLOBAL and the environment, in that order,
      * depending on the FIND_* flags in 'flags'       * depending on the FIND_* flags in 'flags'
      */       */
     var = Lst_Find(ctxt->context, (ClientData)name, VarCmp);      var = Lst_Find(ctxt->context, VarCmp, (ClientData)name);
   
     if ((var == NULL) && (flags & FIND_CMD) && (ctxt != VAR_CMD))      if ((var == NULL) && (flags & FIND_CMD) && (ctxt != VAR_CMD))
         var = Lst_Find (VAR_CMD->context, (ClientData)name, VarCmp);          var = Lst_Find(VAR_CMD->context, VarCmp, (ClientData)name);
     if (!checkEnvFirst && (var == NULL) && (flags & FIND_GLOBAL) &&      if (!checkEnvFirst && (var == NULL) && (flags & FIND_GLOBAL) &&
         (ctxt != VAR_GLOBAL)) {          (ctxt != VAR_GLOBAL)) {
         var = Lst_Find (VAR_GLOBAL->context, (ClientData)name, VarCmp);          var = Lst_Find(VAR_GLOBAL->context, VarCmp, (ClientData)name);
     }      }
     if ((var == NULL) && (flags & FIND_ENV)) {      if ((var == NULL) && (flags & FIND_ENV)) {
         var = Lst_Find(VAR_ENV->context, (ClientData)name, VarCmp);          var = Lst_Find(VAR_ENV->context, VarCmp, (ClientData)name);
         if (var == NULL) {          if (var == NULL) {
             char *env;              char *env;
   
Line 339 
Line 339 
     }      }
     if (var == NULL && checkEnvFirst && (flags & FIND_GLOBAL) &&      if (var == NULL && checkEnvFirst && (flags & FIND_GLOBAL) &&
                    (ctxt != VAR_GLOBAL))                     (ctxt != VAR_GLOBAL))
             var = Lst_Find(VAR_GLOBAL->context, (ClientData)name, VarCmp);              var = Lst_Find(VAR_GLOBAL->context, VarCmp, (ClientData)name);
     if (var == NULL)      if (var == NULL)
         return NULL;          return NULL;
     else      else
Line 435 
Line 435 
     if (DEBUG(VAR)) {      if (DEBUG(VAR)) {
         printf("%s:delete %s\n", ctxt->name, name);          printf("%s:delete %s\n", ctxt->name, name);
     }      }
     ln = Lst_Find(ctxt->context, (ClientData)name, VarCmp);      ln = Lst_Find(ctxt->context, VarCmp, (ClientData)name);
     if (ln != NULL) {      if (ln != NULL) {
         register Var      *v;          register Var      *v;
   

Legend:
Removed from v.1.27  
changed lines
  Added in v.1.28