Changeset 5302

Show
Ignore:
Timestamp:
07/14/08 18:21:48 (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.
Based on an original patch from Sergey Vlasov.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • lm-sensors/branches/lm-sensors-3.0.0/CHANGES

    r5300 r5302  
    33 
    44SVN-HEAD 
     5  libsensors: Avoid namespace pollution 
    56  fancontrol: Don't use named pipes when we don't need them (#2319) 
    67  sensors-detect: Add Intel SCH (bus) support 

  • lm-sensors/branches/lm-sensors-3.0.0/lib/conf-parse.y

    r5163 r5302  
    159159                      sensors_yyerror("Set statement before first chip statement"); 
    160160                      free($2); 
    161                       free_expr($3); 
     161                      sensors_free_expr($3); 
    162162                      YYERROR; 
    163163                    } 
    …… 
    174174                              sensors_yyerror("Compute statement before first chip statement"); 
    175175                              free($2); 
    176                               free_expr($3); 
    177                               free_expr($5); 
     176                              sensors_free_expr($3); 
     177                              sensors_free_expr($5); 
    178178                              YYERROR; 
    179179                            } 

  • lm-sensors/branches/lm-sensors-3.0.0/lib/init.c

    r5169 r5302  
    130130} 
    131131 
    132 void free_expr(sensors_expr *expr) 
     132void sensors_free_expr(sensors_expr *expr) 
    133133{ 
    134134        if (expr->kind == sensors_kind_var) 
    …… 
    136136        else if (expr->kind == sensors_kind_sub) { 
    137137                if (expr->data.subexpr.sub1) 
    138                         free_expr(expr->data.subexpr.sub1); 
     138                        sensors_free_expr(expr->data.subexpr.sub1); 
    139139                if (expr->data.subexpr.sub2) 
    140                         free_expr(expr->data.subexpr.sub2); 
     140                        sensors_free_expr(expr->data.subexpr.sub2); 
    141141        } 
    142142        free(expr); 
    …… 
    146146{ 
    147147        free(set->name); 
    148         free_expr(set->value); 
     148        sensors_free_expr(set->value); 
    149149} 
    150150 
    …… 
    152152{ 
    153153        free(compute->name); 
    154         free_expr(compute->from_proc); 
    155         free_expr(compute->to_proc); 
     154        sensors_free_expr(compute->from_proc); 
     155        sensors_free_expr(compute->to_proc); 
    156156} 
    157157 

  • lm-sensors/branches/lm-sensors-3.0.0/lib/init.h

    r5163 r5302  
    2424#include "data.h" 
    2525 
    26 void free_expr(sensors_expr *expr); 
     26void sensors_free_expr(sensors_expr *expr); 
    2727 
    2828#endif /* def LIB_SENSORS_INIT_H */