Changeset 5301

Show
Ignore:
Timestamp:
07/14/08 18:15:07 (4 months ago)
Author:
khali
Message:

The free_expr() function is no longer static in lib/init.c (it is also
used in lib/conf-parse.y), and therefore must be renamed according to
the libsensors naming conventions.
Patch from Sergey Vlasov.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • lm-sensors/trunk/CHANGES

    r5299 r5301  
    33 
    44SVN-HEAD 
     5  Library: Avoid namespace pollution 
    56   
    67 

  • lm-sensors/trunk/lib/conf-parse.y

    r4790 r5301  
    171171                      sensors_yyerror("Set statement before first chip statement"); 
    172172                      free($2); 
    173                       free_expr($3); 
     173                      sensors_free_expr($3); 
    174174                      YYERROR; 
    175175                    } 
    …… 
    186186                              sensors_yyerror("Compute statement before first chip statement"); 
    187187                              free($2); 
    188                               free_expr($3); 
    189                               free_expr($5); 
     188                              sensors_free_expr($3); 
     189                              sensors_free_expr($5); 
    190190                              YYERROR; 
    191191                            } 

  • lm-sensors/trunk/lib/init.c

    r5286 r5301  
    172172{ 
    173173  free(set.name); 
    174   free_expr(set.value); 
     174  sensors_free_expr(set.value); 
    175175} 
    176176 
    …… 
    178178{ 
    179179  free(compute.name); 
    180   free_expr(compute.from_proc); 
    181   free_expr(compute.to_proc); 
     180  sensors_free_expr(compute.from_proc); 
     181  sensors_free_expr(compute.to_proc); 
    182182} 
    183183 
    …… 
    187187} 
    188188 
    189 void free_expr(sensors_expr *expr) 
     189void sensors_free_expr(sensors_expr *expr) 
    190190{ 
    191191  if ((expr->kind) == sensors_kind_var) 
    …… 
    193193  else if ((expr->kind) == sensors_kind_sub) { 
    194194    if (expr->data.subexpr.sub1) 
    195       free_expr(expr->data.subexpr.sub1); 
     195      sensors_free_expr(expr->data.subexpr.sub1); 
    196196    if (expr->data.subexpr.sub2) 
    197       free_expr(expr->data.subexpr.sub2); 
     197      sensors_free_expr(expr->data.subexpr.sub2); 
    198198  } 
    199199  free(expr); 

  • lm-sensors/trunk/lib/init.h

    r4790 r5301  
    2323#include "data.h" 
    2424 
    25 void free_expr(sensors_expr *expr); 
     25void sensors_free_expr(sensors_expr *expr); 
    2626 
    2727#endif /* def LIB_SENSORS_INIT_H */