[Aptitude-devel] r3102 - in branches/aptitude-0.3/aptitude: . src/generic

Daniel Burrows dburrows@costa.debian.org
Tue, 26 Apr 2005 23:44:56 +0000


Author: dburrows
Date: Tue Apr 26 23:44:53 2005
New Revision: 3102

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptcache.h
Log:
Use field widths in declaring aptitude_state.


Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Apr 26 23:44:53 2005
@@ -1,5 +1,10 @@
 2005-04-26  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/aptcache.h:
+
+	  Pack the extended state information more tightly using field
+	  widths.
+
 	* src/vscreen/fragment.cc:
 
 	  For more correctness, tie the cache to the last seen

Modified: branches/aptitude-0.3/aptitude/src/generic/aptcache.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptcache.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptcache.h	Tue Apr 26 23:44:53 2005
@@ -85,12 +85,12 @@
      *  selection_state is Install, this gives the reason for the
      *  installation.
      */
-    changed_reason install_reason;
+    changed_reason install_reason:3;
 
     /** If the package is going to be removed, this gives the reason
      *  for the removal.
      */
-    changed_reason remove_reason;
+    changed_reason remove_reason:3;
 
     /** True if the package is a "new" package.  This is set on every
      *  package the first time it is seen, and remains set until
@@ -99,7 +99,7 @@
      *  If this field is missing in the state file, it defaults to \b
      *  false.
      */
-    bool new_package;
+    bool new_package:1;
 
     /** If the package is in state Install and is upgradable, this
      *  field determines whether or not it should be upgraded.  This
@@ -115,27 +115,27 @@
      *  If this field is missing in the state file, it defaults to \b
      *  false.
      */
-    bool upgrade;
+    bool upgrade:1;
 
     /** If \b true, the package in question will be reinstalled.
      *
      *  This member is not saved to the state file.
      */
-    bool reinstall;
+    bool reinstall:1;
 
     /** If \b true, the package in question is tagged for an action.
      *
      *  This member is not saved to the state file.
      */
-    bool tagged;
+    bool tagged:1;
 
     /** If \b true, the package in question is flagged for future reference. */
-    bool flagged;
+    bool flagged:1;
 
     /** During mark-and-sweep, this is set to \b true iff the package
      *  is reachable from the root set.
      */
-    bool marked;
+    bool marked:1;
 
     /** When garbage collection runs, this field is set to \b true on
      *  each package that is not reachable from the root set.  These
@@ -143,7 +143,7 @@
      *  is set, but this flag is set whether or not the package is
      *  actually marked for deletion.
      */
-    bool garbage;
+    bool garbage:1;
   };
 
   /** This flag is \b true iff the persistent state has changed (ie, we