debian/patches/52_remove-pragma.diff

   1 Index: smartmontools/atacmds.h
   2 ===================================================================
   3 --- smartmontools.orig/atacmds.h        2013-09-05 13:32:05.011972432 +0200
   4 +++ smartmontools/atacmds.h     2013-09-05 13:32:05.007972432 +0200
   5 @@ -125,7 +125,6 @@
   6
   7  // Needed parts of the ATA DRIVE IDENTIFY Structure. Those labeled
   8  // word* are NOT used.
   9 -#pragma pack(1)
  10  struct ata_identify_device {
  11    unsigned short words000_009[10];
  12    unsigned char  serial_no[20];
  13 @@ -147,7 +146,6 @@
  14  ASSERT_SIZEOF_STRUCT(ata_identify_device, 512);
  15
  16  /* ata_smart_attribute is the vendor specific in SFF-8035 spec */
  17 -#pragma pack(1)
  18  struct ata_smart_attribute {
  19    unsigned char id;
  20    // meaning of flag bits: see MACROS just below
  21 @@ -208,7 +206,6 @@
  22
  23  // Format of data returned by SMART READ DATA
  24  // Table 62 of T13/1699-D (ATA8-ACS) Revision 6a, September 2008
  25 -#pragma pack(1)
  26  struct ata_smart_values {
  27    unsigned short int revnumber;
  28    struct ata_smart_attribute vendor_attributes [NUMBER_ATA_SMART_ATTRIBUTES];
  29 @@ -241,7 +238,6 @@
  30  */
  31
  32  /* Vendor attribute of SMART Threshold (compare to ata_smart_attribute above) */
  33 -#pragma pack(1)
  34  struct ata_smart_threshold_entry {
  35    unsigned char id;
  36    unsigned char threshold;
  37 @@ -252,7 +248,6 @@
  38
  39  /* Format of Read SMART THreshold Command */
  40  /* Compare to ata_smart_values above */
  41 -#pragma pack(1)
  42  struct ata_smart_thresholds_pvt {
  43    unsigned short int revnumber;
  44    struct ata_smart_threshold_entry thres_entries[NUMBER_ATA_SMART_ATTRIBUTES];
  45 @@ -264,7 +259,6 @@
  46
  47
  48  // Table 42 of T13/1321D Rev 1 spec (Error Data Structure)
  49 -#pragma pack(1)
  50  struct ata_smart_errorlog_error_struct {
  51    unsigned char reserved;
  52    unsigned char error_register;
  53 @@ -283,7 +277,6 @@
  54
  55
  56  // Table 41 of T13/1321D Rev 1 spec (Command Data Structure)
  57 -#pragma pack(1)
  58  struct ata_smart_errorlog_command_struct {
  59    unsigned char devicecontrolreg;
  60    unsigned char featuresreg;
  61 @@ -299,7 +292,6 @@
  62  ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_command_struct, 12);
  63
  64  // Table 40 of T13/1321D Rev 1 spec (Error log data structure)
  65 -#pragma pack(1)
  66  struct ata_smart_errorlog_struct {
  67    struct ata_smart_errorlog_command_struct commands[5];
  68    struct ata_smart_errorlog_error_struct error_struct;
  69 @@ -308,7 +300,6 @@
  70  ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_struct, 90);
  71
  72  // Table 39 of T13/1321D Rev 1 spec (SMART error log sector)
  73 -#pragma pack(1)
  74  struct ata_smart_errorlog {
  75    unsigned char revnumber;
  76    unsigned char error_log_pointer;
  77 @@ -405,7 +396,6 @@
  78
  79
  80  // Table 45 of T13/1321D Rev 1 spec (Self-test log descriptor entry)
  81 -#pragma pack(1)
  82  struct ata_smart_selftestlog_struct {
  83    unsigned char selftestnumber; // Sector number register
  84    unsigned char selfteststatus;
  85 @@ -418,7 +408,6 @@
  86  ASSERT_SIZEOF_STRUCT(ata_smart_selftestlog_struct, 24);
  87
  88  // Table 44 of T13/1321D Rev 1 spec (Self-test log data structure)
  89 -#pragma pack(1)
  90  struct ata_smart_selftestlog {
  91    unsigned short int revnumber;
  92    struct ata_smart_selftestlog_struct selftest_struct[21];
  93 @@ -467,7 +456,6 @@
  94  ASSERT_SIZEOF_STRUCT(ata_smart_extselftestlog, 512);
  95
  96  // SMART LOG DIRECTORY Table 52 of T13/1532D Vol 1 Rev 1a
  97 -#pragma pack(1)
  98  struct ata_smart_log_entry {
  99    unsigned char numsectors;
 100    unsigned char reserved;
 101 @@ -475,7 +463,6 @@
 102  #pragma pack()
 103  ASSERT_SIZEOF_STRUCT(ata_smart_log_entry, 2);
 104
 105 -#pragma pack(1)
 106  struct ata_smart_log_directory {
 107    unsigned short int logversion;
 108    struct ata_smart_log_entry entry[255];
 109 @@ -485,7 +472,6 @@
 110
 111  // SMART SELECTIVE SELF-TEST LOG Table 61 of T13/1532D Volume 1
 112  // Revision 3
 113 -#pragma pack(1)
 114  struct test_span {
 115    uint64_t start;
 116    uint64_t end;
 117 @@ -493,7 +479,6 @@
 118  #pragma pack()
 119  ASSERT_SIZEOF_STRUCT(test_span, 16);
 120
 121 -#pragma pack(1)
 122  struct ata_selective_self_test_log {
 123    unsigned short     logversion;
 124    struct test_span   span[5];