Changeset 4465

Timestamp:

06/25/07 16:21:01 (6 years ago)

Author:

khali

Message:

Delete all remnants of algorithm names.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (1 diff)
• doc/FAQ (modified) (3 diffs)
• doc/lm_sensors-FAQ.html (modified) (4 diffs)
• doc/lm_sensors-FAQ.texi (modified) (3 diffs)
• lib/access.c (modified) (1 diff)
• lib/conf-parse.y (modified) (4 diffs)
• lib/data.c (modified) (1 diff)
• lib/libsensors.3 (modified) (2 diffs)
• lib/sensors.conf.5 (modified) (2 diffs)
• lib/sensors.h (modified) (1 diff)
• prog/sensors/main.c (modified) (3 diffs)

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

@@ -16 +16 @@
            Always build with sysfs support
            Delete procfs support (Linux 2.4)
+           Delete all remnants of algorithm names
   Man page sensors.conf.5: Update the chip statement section
   Programs doc/*: Delete, obsolete

lm-sensors/branches/lm-sensors-3.0.0/doc/FAQ

@@ -95 +95 @@
     4.24.3 Sensors-detect doesn't find any sensors!
   4.25 Sensors says `Error: Line xxx: zzzzzzz'
-  4.26 Sensors only gives the name, adapter, and algorithm for my chip
+  4.26 Sensors only gives the name and adapter for my chip
   4.27 Sensors says `ERROR: Can't get xxxxx data!'
   4.28 Sensors doesn't find any sensors, just eeproms.
@@ -1104 +1104 @@
 in double quotes.
 
-4.26 Sensors only gives the name, adapter, and algorithm for my chip
-====================================================================
+4.26 Sensors only gives the name and adapter for my chip
+========================================================
 
 If `sensors' only says this, for example, and doesn't provide any
@@ -1112 +1112 @@
      it87-isa-0290
      Adapter: ISA adapter
-     Algorithm: ISA algorithm
 
    Your chip is not currently supported by `sensors' and so all it does

lm-sensors/branches/lm-sensors-3.0.0/doc/lm_sensors-FAQ.html

@@ -153 +153 @@
 </li></ul>
 <li><a href="#Section-4_002e25">4.25 Sensors says `<samp><span class="samp">Error: Line xxx: zzzzzzz</span></samp>'</a>
-<li><a href="#Section-4_002e26">4.26 Sensors only gives the name, adapter, and algorithm for my chip</a>
+<li><a href="#Section-4_002e26">4.26 Sensors only gives the name and adapter for my chip</a>
 <li><a href="#Section-4_002e27">4.27 Sensors says `<samp><span class="samp">ERROR: Can't get xxxxx data!</span></samp>'</a>
 <li><a href="#Section-4_002e28">4.28 Sensors doesn't find any sensors, just eeproms.</a>
@@ -898 +898 @@
 <li><a href="#Section-4_002e24">Section 4.24</a>:         Sensors-detect doesn't work at all
 <li><a href="#Section-4_002e25">Section 4.25</a>:         Sensors says `<samp><span class="samp">Error: Line xxx: zzzzzzz</span></samp>'
-<li><a href="#Section-4_002e26">Section 4.26</a>:         Sensors only gives the name, adapter, and algorithm! 
+<li><a href="#Section-4_002e26">Section 4.26</a>:         Sensors only gives the name and adapter! 
 <li><a href="#Section-4_002e27">Section 4.27</a>:         Sensors says `<samp><span class="samp">ERROR: Can't get xxxxx data!</span></samp>'
 <li><a href="#Section-4_002e28">Section 4.28</a>:         Sensors doesn't find any sensors, just eeproms. 
@@ -1680 +1680 @@
 </div>
 
-<h3 class="section">4.26 Sensors only gives the name, adapter, and algorithm for my chip</h3>
+<h3 class="section">4.26 Sensors only gives the name and adapter for my chip</h3>
 
 <p>If <samp><span class="command">sensors</span></samp> only says this, for example, and doesn't
@@ -1687 +1687 @@
 <pre class="example">     it87-isa-0290
      Adapter: ISA adapter
-     Algorithm: ISA algorithm
 </pre>
    <p>Your chip is not currently supported by <samp><span class="command">sensors</span></samp> and so all it

lm-sensors/branches/lm-sensors-3.0.0/doc/lm_sensors-FAQ.texi

@@ -562 +562 @@
 * Section 4.24::        Sensors-detect doesn't work at all
 * Section 4.25::        Sensors says @samp{Error: Line xxx: zzzzzzz}
-* Section 4.26::        Sensors only gives the name, adapter, and algorithm!
+* Section 4.26::        Sensors only gives the name and adapter!
 * Section 4.27::        Sensors says @samp{ERROR: Can't get xxxxx data!}
 * Section 4.28::        Sensors doesn't find any sensors, just eeproms.
@@ -1143 +1143 @@
 
 @node Section 4.26, Section 4.27, Section 4.25, Problems
-@section Sensors only gives the name, adapter, and algorithm for my chip
+@section Sensors only gives the name and adapter for my chip
 
 If @command{sensors} only says this, for example, and doesn't
@@ -1151 +1151 @@
 it87-isa-0290
 Adapter: ISA adapter
-Algorithm: ISA algorithm
 @end example
 

lm-sensors/branches/lm-sensors-3.0.0/lib/access.c

@@ -326 +326 @@
 }
 
-/* This function is deprecated and will be dropped soon. */
-const char *sensors_get_algorithm_name(int bus_nr)
-{
-        return "No longer available";
-}
-
 /* nr1-1 is the last main feature found; nr2-1 is the last subfeature found */
 const sensors_feature_data *sensors_get_all_features(sensors_chip_name name,

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

@@ -121 +121 @@
 %type <bus> i2cbus_name
 %type <name> adapter_name
-%type <name> algorithm_name
 %type <name> function_name
 %type <name> string
@@ -135 +134 @@
 
 line:     bus_statement EOL
-        | busalgo_statement EOL
         | label_statement EOL
         | set_statement EOL
@@ -151 +149 @@
                     bus_add_el(&new_el);
                   }
-;
-
-/* for compatibility, deprecated */
-busalgo_statement:        BUS i2cbus_name adapter_name algorithm_name
-                          { sensors_bus new_el;
-                            new_el.lineno = $1;
-                            new_el.number = $2;
-                            new_el.adapter = $3;
-                            free($4);
-                            bus_add_el(&new_el);
-                          }
 ;
 
@@ -316 +303 @@
 ;
 
-algorithm_name:   NAME
-                  { sensors_strip_of_spaces($1);
-                    $$ = $1; }
-;
-
 function_name:    NAME
                   { $$ = $1; }

lm-sensors/branches/lm-sensors-3.0.0/lib/data.c

@@ -239 +239 @@
   }
 
-  /* We used to compare both the adapter and the algorithm names for
-     bus matching, but Linux 2.6 has no more names for algorithms, and
-     it was redundant anyway. So we now only rely on the adapter name. */
+  /* Compare the adapter names */
   for (j = 0; j < sensors_proc_bus_count; j++) {
     if (!strcmp(sensors_config_busses[i].adapter,

lm-sensors/branches/lm-sensors-3.0.0/lib/libsensors.3

@@ -25 +25 @@
 .\" References consulted:
 .\"     libsensors source code
-.TH libsensors 3  "October 2006" "" "Linux Programmer's Manual"
+.TH libsensors 3  "June 2007" "" "Linux Programmer's Manual"
 .SH NAME
 libsensors \- publicly accessible functions provided by the sensors library
@@ -81 +81 @@
 This function returns the adapter name of a bus number, as used within the
 sensors_chip_name structure. If it could not be found, it returns NULL.
-
-.B const char *sensors_get_algorithm_name(int bus_nr);
-.br
-This function used to return the algorithm name of a bus number.
-It is now deprecated and returns an arbitrary string. It will be dropped
-in a later version of the library so you should stop using it.
 
 \fBint sensors_get_label(sensors_chip_name name, int feature,

lm-sensors/branches/lm-sensors-3.0.0/lib/sensors.conf.5

@@ -24 +24 @@
 .\" References consulted:
 .\"     sensors.conf.eg by Frodo Looijaard
-.TH sensors.conf 5  "April 2007" "" "Linux Programmer's Manual"
+.TH sensors.conf 5  "June 2007" "" "Linux Programmer's Manual"
 .SH NAME
 sensors.conf \- libsensors configuration file
@@ -149 +149 @@
 It should always be quoted as well as it will most certainly contain
 spaces or dashes.
-
-There used to be a third argument, the algorithm name. For compatibility
-reasons, the parser still accepts this third argument, but ignores it.
 
 The

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

@@ -74 +74 @@
    it returns NULL */
 extern const char *sensors_get_adapter_name(int bus_nr);
-
-/* This function is deprecated and will be dropped soon. */
-extern const char *sensors_get_algorithm_name(int bus_nr);
 
 /* Look up the label which belongs to this chip. Note that chip should not

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/main.c

@@ -162 +162 @@
     { "config-file", required_argument, NULL, 'c' },
     { "unknown", no_argument, NULL, 'u' },
-    /* next option accepted for compatibility, but otherwise ignored */
-    { "algorithm", no_argument, NULL, 'a' },
     { "generic", no_argument, NULL, 'g'},
     { 0,0,0,0 }
@@ -176 +174 @@
   do_generic = 0;
   while (1) {
-    c = getopt_long(argc,argv,"hsvfaAUc:ug",long_opts,NULL);
+    c = getopt_long(argc, argv, "hsvfAUc:ug", long_opts, NULL);
     if (c == EOF)
       break;
@@ -207 +205 @@
     case 'u':
       do_unknown = 1;
-      break;
-    case 'a':
-      /* Ignore for compatibility */
       break;
     case 'g':