Blame 800-replace-zeroes-with-null.patch
|
Leigh Scott |
45b62b9 |
|
|
Leigh Scott |
45b62b9 |
Correctly specify NULLs for 64-bit architectures.
|
|
Leigh Scott |
45b62b9 |
unchanged:
|
|
Leigh Scott |
45b62b9 |
Index: html2text-1.3.2a/format.C
|
|
Leigh Scott |
45b62b9 |
===================================================================
|
|
Leigh Scott |
45b62b9 |
--- html2text-1.3.2a.orig/format.C 2008-09-15 20:30:26.413093842 +0300
|
|
Leigh Scott |
45b62b9 |
+++ html2text-1.3.2a/format.C 2008-09-15 20:30:35.692976620 +0300
|
|
Leigh Scott |
45b62b9 |
@@ -560,7 +560,7 @@
|
|
Leigh Scott |
45b62b9 |
"LEFT", Area::LEFT,
|
|
Leigh Scott |
45b62b9 |
"CENTER", Area::CENTER,
|
|
Leigh Scott |
45b62b9 |
"RIGHT", Area::RIGHT,
|
|
Leigh Scott |
45b62b9 |
- 0
|
|
Leigh Scott |
45b62b9 |
+ NULL
|
|
Leigh Scott |
45b62b9 |
);
|
|
Leigh Scott |
45b62b9 |
|
|
Leigh Scott |
45b62b9 |
static char cell_attributes[7];
|
|
Leigh Scott |
45b62b9 |
@@ -682,7 +682,7 @@
|
|
Leigh Scott |
45b62b9 |
"LEFT", Area::LEFT,
|
|
Leigh Scott |
45b62b9 |
"CENTER", Area::CENTER,
|
|
Leigh Scott |
45b62b9 |
"RIGHT", Area::RIGHT,
|
|
Leigh Scott |
45b62b9 |
- 0
|
|
Leigh Scott |
45b62b9 |
+ NULL
|
|
Leigh Scott |
45b62b9 |
);
|
|
Leigh Scott |
45b62b9 |
|
|
Leigh Scott |
45b62b9 |
static BlockFormat bf("P");
|
|
Leigh Scott |
45b62b9 |
@@ -752,7 +752,7 @@
|
|
Leigh Scott |
45b62b9 |
"LEFT", Area::LEFT,
|
|
Leigh Scott |
45b62b9 |
"MIDDLE", Area::CENTER,
|
|
Leigh Scott |
45b62b9 |
"RIGHT", Area::RIGHT,
|
|
Leigh Scott |
45b62b9 |
- 0
|
|
Leigh Scott |
45b62b9 |
+ NULL
|
|
Leigh Scott |
45b62b9 |
);
|
|
Leigh Scott |
45b62b9 |
Area *a = ::format(content.get(), w, halign);
|
|
Leigh Scott |
45b62b9 |
if (a) return a;
|
|
Leigh Scott |
45b62b9 |
@@ -802,7 +802,7 @@
|
|
Leigh Scott |
45b62b9 |
"LEFT", Area::LEFT,
|
|
Leigh Scott |
45b62b9 |
"CENTER", Area::CENTER,
|
|
Leigh Scott |
45b62b9 |
"RIGHT", Area::RIGHT,
|
|
Leigh Scott |
45b62b9 |
- 0
|
|
Leigh Scott |
45b62b9 |
+ NULL
|
|
Leigh Scott |
45b62b9 |
));
|
|
Leigh Scott |
45b62b9 |
}
|
|
Leigh Scott |
45b62b9 |
|
|
Leigh Scott |
45b62b9 |
@@ -1635,7 +1635,7 @@
|
|
Leigh Scott |
45b62b9 |
"A", UPPER_ALPHA,
|
|
Leigh Scott |
45b62b9 |
"i", LOWER_ROMAN,
|
|
Leigh Scott |
45b62b9 |
"I", UPPER_ROMAN,
|
|
Leigh Scott |
45b62b9 |
- 0
|
|
Leigh Scott |
45b62b9 |
+ NULL
|
|
Leigh Scott |
45b62b9 |
);
|
|
Leigh Scott |
45b62b9 |
}
|
|
Leigh Scott |
45b62b9 |
|
|
Leigh Scott |
45b62b9 |
Index: html2text-1.3.2a/table.C
|
|
Leigh Scott |
45b62b9 |
===================================================================
|
|
Leigh Scott |
45b62b9 |
--- html2text-1.3.2a.orig/table.C 2008-09-15 20:30:26.417093442 +0300
|
|
Leigh Scott |
45b62b9 |
+++ html2text-1.3.2a/table.C 2008-09-15 20:30:35.692976620 +0300
|
|
Leigh Scott |
45b62b9 |
@@ -122,14 +122,14 @@
|
|
Leigh Scott |
45b62b9 |
"LEFT", Area::LEFT,
|
|
Leigh Scott |
45b62b9 |
"CENTER", Area::CENTER,
|
|
Leigh Scott |
45b62b9 |
"RIGHT", Area::RIGHT,
|
|
Leigh Scott |
45b62b9 |
- 0
|
|
Leigh Scott |
45b62b9 |
+ NULL
|
|
Leigh Scott |
45b62b9 |
);
|
|
Leigh Scott |
45b62b9 |
int row_valign = get_attribute(
|
|
Leigh Scott |
45b62b9 |
row.attributes.get(), "VALIGN", Area::MIDDLE,
|
|
Leigh Scott |
45b62b9 |
"TOP", Area::LEFT,
|
|
Leigh Scott |
45b62b9 |
"MIDDLE", Area::MIDDLE,
|
|
Leigh Scott |
45b62b9 |
"BOTTOM", Area::BOTTOM,
|
|
Leigh Scott |
45b62b9 |
- 0
|
|
Leigh Scott |
45b62b9 |
+ NULL
|
|
Leigh Scott |
45b62b9 |
);
|
|
Leigh Scott |
45b62b9 |
|
|
Leigh Scott |
45b62b9 |
const list<auto_ptr<TableCell> > &cl(*row.cells);
|
|
Leigh Scott |
45b62b9 |
@@ -158,14 +158,14 @@
|
|
Leigh Scott |
45b62b9 |
"LEFT", Area::LEFT,
|
|
Leigh Scott |
45b62b9 |
"CENTER", Area::CENTER,
|
|
Leigh Scott |
45b62b9 |
"RIGHT", Area::RIGHT,
|
|
Leigh Scott |
45b62b9 |
- 0
|
|
Leigh Scott |
45b62b9 |
+ NULL
|
|
Leigh Scott |
45b62b9 |
);
|
|
Leigh Scott |
45b62b9 |
p->valign = get_attribute(
|
|
Leigh Scott |
45b62b9 |
cell.attributes.get(), "VALIGN", row_valign,
|
|
Leigh Scott |
45b62b9 |
"TOP", Area::TOP,
|
|
Leigh Scott |
45b62b9 |
"MIDDLE", Area::MIDDLE,
|
|
Leigh Scott |
45b62b9 |
"BOTTOM", Area::BOTTOM,
|
|
Leigh Scott |
45b62b9 |
- 0
|
|
Leigh Scott |
45b62b9 |
+ NULL
|
|
Leigh Scott |
45b62b9 |
);
|
|
Leigh Scott |
45b62b9 |
{
|
|
Leigh Scott |
45b62b9 |
auto_ptr<Area> tmp(cell.format(
|
|
Leigh Scott |
45b62b9 |
@@ -386,7 +386,7 @@
|
|
Leigh Scott |
45b62b9 |
"LEFT", Area::LEFT,
|
|
Leigh Scott |
45b62b9 |
"CENTER", Area::CENTER,
|
|
Leigh Scott |
45b62b9 |
"RIGHT", Area::RIGHT,
|
|
Leigh Scott |
45b62b9 |
- 0
|
|
Leigh Scott |
45b62b9 |
+ NULL
|
|
Leigh Scott |
45b62b9 |
);
|
|
Leigh Scott |
45b62b9 |
|
|
Leigh Scott |
45b62b9 |
// => default => no border
|
|
Leigh Scott |
45b62b9 |
|