[kernel] r6320 - people/waldi/linux-kbuild-2.6/src/mod

[Bastian Blank]

Author: waldi
Date: Tue Mar 28 16:07:58 2006
New Revision: 6320

Modified:
   people/waldi/linux-kbuild-2.6/src/mod/module_devicetable.cpp
   people/waldi/linux-kbuild-2.6/src/mod/module_devicetable.hpp
   people/waldi/linux-kbuild-2.6/src/mod/module_devicetable_impl_2_6_16.cpp
   people/waldi/linux-kbuild-2.6/src/mod/module_devicetable_impl_2_6_16.hpp
Log:
src/mod/module_devicetable.cpp,
src/mod/module_devicetable.hpp,
src/mod/module_devicetable_impl_2_6_16.cpp,
src/mod/module_devicetable_impl_2_6_16.hpp:
Don't use a vector if not needed.


Modified: people/waldi/linux-kbuild-2.6/src/mod/module_devicetable.cpp
==============================================================================
--- people/waldi/linux-kbuild-2.6/src/mod/module_devicetable.cpp	(original)
+++ people/waldi/linux-kbuild-2.6/src/mod/module_devicetable.cpp	Tue Mar 28 16:07:58 2006
@@ -43,7 +43,7 @@
 
     void table_base::write (std::ostream &out) const throw (std::runtime_error)
     { 
-      for (std::vector<table_entry *>::const_iterator it = entries.begin (); it != entries.end (); ++it)
+      for (std::list<table_entry *>::const_iterator it = entries.begin (); it != entries.end (); ++it)
       { 
         out << "MODULE_ALIAS(\"";
         (*it)->write (out);

Modified: people/waldi/linux-kbuild-2.6/src/mod/module_devicetable.hpp
==============================================================================
--- people/waldi/linux-kbuild-2.6/src/mod/module_devicetable.hpp	(original)
+++ people/waldi/linux-kbuild-2.6/src/mod/module_devicetable.hpp	Tue Mar 28 16:07:58 2006
@@ -26,7 +26,6 @@
 #include <list>
 #include <ostream>
 #include <stdexcept>
-#include <vector>
 
 namespace linuxkernel
 {
@@ -95,7 +94,7 @@
       protected:
         table_base () throw () {};
 
-        std::vector<table_entry *> entries;
+        std::list<table_entry *> entries;
     };
 
     template<typename Elf_class, typename Elf_data>

Modified: people/waldi/linux-kbuild-2.6/src/mod/module_devicetable_impl_2_6_16.cpp
==============================================================================
--- people/waldi/linux-kbuild-2.6/src/mod/module_devicetable_impl_2_6_16.cpp	(original)
+++ people/waldi/linux-kbuild-2.6/src/mod/module_devicetable_impl_2_6_16.cpp	Tue Mar 28 16:07:58 2006
@@ -241,8 +241,7 @@
 }
 
 template<typename Elf_class, typename Elf_data>
-void table_entry_data<device_usb, version_2_6_16, Elf_class, Elf_data>::add
-(const device_id<device_usb, Elf_class> &id, std::vector<table_entry *> &table) throw ()
+void table_entry_data<device_usb, version_2_6_16, Elf_class, Elf_data>::add (const device_id<device_usb, Elf_class> &id, std::list<table_entry *> &table) throw ()
 {
   uint16_t match_flags;
   uint16_t idVendor;
@@ -297,7 +296,6 @@
   // Remove the terminator.
   len--;
   const devin *e = static_cast <const devin *> (mem);
-  this->entries.reserve (len);
   for (size_t i = 0; i < len; ++i)
     table_entry_data<device, version_2_6_16, Elf_class, Elf_data>::add (e[i], this->entries);
 }

Modified: people/waldi/linux-kbuild-2.6/src/mod/module_devicetable_impl_2_6_16.hpp
==============================================================================
--- people/waldi/linux-kbuild-2.6/src/mod/module_devicetable_impl_2_6_16.hpp	(original)
+++ people/waldi/linux-kbuild-2.6/src/mod/module_devicetable_impl_2_6_16.hpp	Tue Mar 28 16:07:58 2006
@@ -242,7 +242,7 @@
           table_entry_data (const device_id<device_ccw, Elf_class> &) throw ();
 
         public:
-          static void add (const device_id<device_ccw, Elf_class> &id, std::vector<table_entry *> &table) throw ()
+          static void add (const device_id<device_ccw, Elf_class> &id, std::list<table_entry *> &table) throw ()
           {
             table.push_back (new table_entry_data<device_ccw, version_2_6_16, Elf_class, Elf_data> (id));
           }
@@ -269,7 +269,7 @@
           table_entry_data (const device_id<device_ieee1394, Elf_class> &) throw ();
 
         public:
-          static void add (const device_id<device_ieee1394, Elf_class> &id, std::vector<table_entry *> &table) throw ()
+          static void add (const device_id<device_ieee1394, Elf_class> &id, std::list<table_entry *> &table) throw ()
           {
             table.push_back (new table_entry_data<device_ieee1394, version_2_6_16, Elf_class, Elf_data> (id));
           }
@@ -294,7 +294,7 @@
           table_entry_data (const device_id<device_pci, Elf_class> &) throw ();
 
         public:
-          static void add (const device_id<device_pci, Elf_class> &id, std::vector<table_entry *> &table) throw ()
+          static void add (const device_id<device_pci, Elf_class> &id, std::list<table_entry *> &table) throw ()
           {
             table.push_back (new table_entry_data<device_pci, version_2_6_16, Elf_class, Elf_data> (id));
           }
@@ -316,7 +316,7 @@
           table_entry_data (const device_id<device_pnp, Elf_class> &) throw ();
 
         public:
-          static void add (const device_id<device_pnp, Elf_class> &id, std::vector<table_entry *> &table) throw ()
+          static void add (const device_id<device_pnp, Elf_class> &id, std::list<table_entry *> &table) throw ()
           {
             table.push_back (new table_entry_data<device_pnp, version_2_6_16, Elf_class, Elf_data> (id));
           }
@@ -338,7 +338,7 @@
           table_entry_data (const device_id<device_pnp_card, Elf_class> &) throw ();
 
         public:
-          static void add (const device_id<device_pnp_card, Elf_class> &id, std::vector<table_entry *> &table) throw ()
+          static void add (const device_id<device_pnp_card, Elf_class> &id, std::list<table_entry *> &table) throw ()
           {
             table.push_back (new table_entry_data<device_pnp_card, version_2_6_16, Elf_class, Elf_data> (id));
           }
@@ -373,7 +373,7 @@
           table_entry_data (const device_id<device_usb, Elf_class> &, uint16_t bcdDevice_initial, int bcdDevice_initial_digits, unsigned char range_lo, unsigned char range_hi) throw ();
 
         public:
-          static void add (const device_id<device_usb, Elf_class> &, std::vector<table_entry *> &table) throw ();
+          static void add (const device_id<device_usb, Elf_class> &, std::list<table_entry *> &table) throw ();
       };
 
     template<typename device, typename Elf_class, typename Elf_data>