aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-04-18 00:47:36 -04:00
Code

Trim trailing whitespaces.

Browse Source
This commit is contained in:
Laurent MONIN 2006-05-31 19:34:49 +02:00 committed by Laurent MONIN
parent 1d3656a317
commit 5acb5e6663
14 changed files with 97 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bfu/inpfield.c
View File

@ -250,7 +250,7 @@ input_dialog(struct terminal *term, struct memory_list *ml,
widget_handler_T *check, widget_handler_T *check,
void (*fn)(void *, unsigned char *), void (*fn)(void *, unsigned char *),
void (*cancelfn)(void *)) void (*cancelfn)(void *))
{ {
/* [gettext_accelerator_context(input_dialog)] */ /* [gettext_accelerator_context(input_dialog)] */
input_field(term, ml, 1, title, text, N_("~OK"), N_("~Cancel"), input_field(term, ml, 1, title, text, N_("~OK"), N_("~Cancel"),
data, history, l, data, history, l,

2
src/config/kbdbind.h
View File

@ -206,5 +206,5 @@ void add_actions_to_string(struct string *string, action_id_T actions[],
enum keymap_id keymap_id, struct terminal *term); enum keymap_id keymap_id, struct terminal *term);
extern struct module kbdbind_module; extern struct module kbdbind_module;
#endif #endif

2
src/dom/sgml/parser.c
View File

@ -570,7 +570,7 @@ sgml_parsing_pop(struct dom_stack *stack, struct dom_node *node, void *data)
} }
/* It's bigger than when calling done_sgml_parser() in the middle of an /* It's bigger than when calling done_sgml_parser() in the middle of an
* incomplete parsing. */ * incomplete parsing. */
assert(parsing->depth >= parser->stack.depth); assert(parsing->depth >= parser->stack.depth);
} }
done_dom_string(&parsing->incomplete); done_dom_string(&parsing->incomplete);

2
src/dom/sgml/scanner.c
View File

@ -640,7 +640,7 @@ scan_sgml_element_token(struct dom_scanner *scanner, struct dom_scanner_token *t
*/ */
if (string == scanner->end) { if (string == scanner->end) {
/* Prevent out of bound access. */ /* Prevent out of bound access. */
} else if (*string == '>') { } else if (*string == '>') {
string++; string++;
real_length = 0; real_length = 0;

110
src/dom/test/html-mangle.c
View File

@ -44,63 +44,63 @@
/* Tag and parameter list: guesstimating / reference compilation. */ /* Tag and parameter list: guesstimating / reference compilation. */
static char* tags[MAXTAGS][MAXPARS] = { static char* tags[MAXTAGS][MAXPARS] = {
{ "A", "NAME", "HREF", "REF", "REV", "TITLE", "TARGET", "SHAPE", "onLoad", "STYLE", 0 }, { "A", "NAME", "HREF", "REF", "REV", "TITLE", "TARGET", "SHAPE", "onLoad", "STYLE", 0 },
{ "APPLET", "CODEBASE", "CODE", "NAME", "ALIGN", "ALT", "HEIGHT", "WIDTH", "HSPACE", "VSPACE", "DOWNLOAD", "HEIGHT", "NAME", "TITLE", "onLoad", "STYLE", 0 }, { "APPLET", "CODEBASE", "CODE", "NAME", "ALIGN", "ALT", "HEIGHT", "WIDTH", "HSPACE", "VSPACE", "DOWNLOAD", "HEIGHT", "NAME", "TITLE", "onLoad", "STYLE", 0 },
{ "AREA", "SHAPE", "ALT", "CO-ORDS", "HREF", "onLoad", "STYLE", 0 }, { "AREA", "SHAPE", "ALT", "CO-ORDS", "HREF", "onLoad", "STYLE", 0 },
{ "B", "onLoad", "STYLE", 0 }, { "B", "onLoad", "STYLE", 0 },
{ "BANNER", "onLoad", "STYLE", 0 }, { "BANNER", "onLoad", "STYLE", 0 },
{ "BASE", "HREF", "TARGET", "onLoad", "STYLE", 0 }, { "BASE", "HREF", "TARGET", "onLoad", "STYLE", 0 },
{ "BASEFONT", "SIZE", "onLoad", "STYLE", 0 }, { "BASEFONT", "SIZE", "onLoad", "STYLE", 0 },
{ "BGSOUND", "SRC", "LOOP", "onLoad", "STYLE", 0 }, { "BGSOUND", "SRC", "LOOP", "onLoad", "STYLE", 0 },
{ "BQ", "CLEAR", "NOWRAP", "onLoad", "STYLE", 0 }, { "BQ", "CLEAR", "NOWRAP", "onLoad", "STYLE", 0 },
{ "BODY", "BACKGROUND", "BGCOLOR", "TEXT", "LINK", "ALINK", "VLINK", "LEFTMARGIN", "TOPMARGIN", "BGPROPERTIES", "onLoad", "STYLE", 0 }, { "BODY", "BACKGROUND", "BGCOLOR", "TEXT", "LINK", "ALINK", "VLINK", "LEFTMARGIN", "TOPMARGIN", "BGPROPERTIES", "onLoad", "STYLE", 0 },
{ "CAPTION", "ALIGN", "VALIGN", "onLoad", "STYLE", 0 }, { "CAPTION", "ALIGN", "VALIGN", "onLoad", "STYLE", 0 },
{ "CENTER", "onLoad", "STYLE", 0 }, { "CENTER", "onLoad", "STYLE", 0 },
{ "COL", "ALIGN", "SPAN", "onLoad", "STYLE", 0 }, { "COL", "ALIGN", "SPAN", "onLoad", "STYLE", 0 },
{ "COLGROUP", "ALIGN", "VALIGN", "HALIGN", "WIDTH", "SPAN", "onLoad", "STYLE", 0 }, { "COLGROUP", "ALIGN", "VALIGN", "HALIGN", "WIDTH", "SPAN", "onLoad", "STYLE", 0 },
{ "DIV", "ALIGN", "CLASS", "LANG", "onLoad", "STYLE", 0 }, { "DIV", "ALIGN", "CLASS", "LANG", "onLoad", "STYLE", 0 },
{ "EMBED", "SRC", "HEIGHT", "WIDTH", "UNITS", "NAME", "PALETTE", "onLoad", "STYLE", 0 }, { "EMBED", "SRC", "HEIGHT", "WIDTH", "UNITS", "NAME", "PALETTE", "onLoad", "STYLE", 0 },
{ "FIG", "SRC", "ALIGN", "HEIGHT", "WIDTH", "UNITS", "IMAGEMAP", "onLoad", "STYLE", 0 }, { "FIG", "SRC", "ALIGN", "HEIGHT", "WIDTH", "UNITS", "IMAGEMAP", "onLoad", "STYLE", 0 },
{ "FN", "ID", "onLoad", "STYLE", 0 }, { "FN", "ID", "onLoad", "STYLE", 0 },
{ "FONT", "SIZE", "COLOR", "FACE", "onLoad", "STYLE", 0 }, { "FONT", "SIZE", "COLOR", "FACE", "onLoad", "STYLE", 0 },
{ "FORM", "ACTION", "METHOD", "ENCTYPE", "TARGET", "SCRIPT", "onLoad", "STYLE", 0 }, { "FORM", "ACTION", "METHOD", "ENCTYPE", "TARGET", "SCRIPT", "onLoad", "STYLE", 0 },
{ "FRAME", "SRC", "NAME", "MARGINWIDTH", "MARGINHEIGHT", "SCROLLING", "FRAMESPACING", "onLoad", "STYLE", 0 }, { "FRAME", "SRC", "NAME", "MARGINWIDTH", "MARGINHEIGHT", "SCROLLING", "FRAMESPACING", "onLoad", "STYLE", 0 },
{ "FRAMESET", "ROWS", "COLS", "onLoad", "STYLE", 0 }, { "FRAMESET", "ROWS", "COLS", "onLoad", "STYLE", 0 },
{ "H1", "SRC", "DINGBAT", "onLoad", "STYLE", 0 }, { "H1", "SRC", "DINGBAT", "onLoad", "STYLE", 0 },
{ "HEAD", "onLoad", "STYLE", 0 }, { "HEAD", "onLoad", "STYLE", 0 },
{ "HR", "SRC", "SIZE", "WIDTH", "ALIGN", "COLOR", "onLoad", "STYLE", 0 }, { "HR", "SRC", "SIZE", "WIDTH", "ALIGN", "COLOR", "onLoad", "STYLE", 0 },
{ "HTML", "onLoad", "STYLE", 0 }, { "HTML", "onLoad", "STYLE", 0 },
{ "IFRAME", "ALIGN", "FRAMEBORDER", "HEIGHT", "MARGINHEIGHT", "MARGINWIDTH", "NAME", "SCROLLING", "SRC", "ADDRESS", "WIDTH", "onLoad", "STYLE", 0 }, { "IFRAME", "ALIGN", "FRAMEBORDER", "HEIGHT", "MARGINHEIGHT", "MARGINWIDTH", "NAME", "SCROLLING", "SRC", "ADDRESS", "WIDTH", "onLoad", "STYLE", 0 },
{ "IMG", "ALIGN", "ALT", "SRC", "BORDER", "DYNSRC", "HEIGHT", "HSPACE", "ISMAP", "LOOP", "LOWSRC", "START", "UNITS", "USEMAP", "WIDTH", "VSPACE", "onLoad", "STYLE", 0 }, { "IMG", "ALIGN", "ALT", "SRC", "BORDER", "DYNSRC", "HEIGHT", "HSPACE", "ISMAP", "LOOP", "LOWSRC", "START", "UNITS", "USEMAP", "WIDTH", "VSPACE", "onLoad", "STYLE", 0 },
{ "INPUT", "TYPE", "NAME", "VALUE", "onLoad", "STYLE", 0 }, { "INPUT", "TYPE", "NAME", "VALUE", "onLoad", "STYLE", 0 },
{ "ISINDEX", "HREF", "PROMPT", "onLoad", "STYLE", 0 }, { "ISINDEX", "HREF", "PROMPT", "onLoad", "STYLE", 0 },
{ "LI", "SRC", "DINGBAT", "SKIP", "TYPE", "VALUE", "onLoad", "STYLE", 0 }, { "LI", "SRC", "DINGBAT", "SKIP", "TYPE", "VALUE", "onLoad", "STYLE", 0 },
{ "LINK", "REL", "REV", "HREF", "TITLE", "onLoad", "STYLE", 0 }, { "LINK", "REL", "REV", "HREF", "TITLE", "onLoad", "STYLE", 0 },
{ "MAP", "NAME", "onLoad", "STYLE", 0 }, { "MAP", "NAME", "onLoad", "STYLE", 0 },
{ "MARQUEE", "ALIGN", "BEHAVIOR", "BGCOLOR", "DIRECTION", "HEIGHT", "HSPACE", "LOOP", "SCROLLAMOUNT", "SCROLLDELAY", "WIDTH", "VSPACE", "onLoad", "STYLE", 0 }, { "MARQUEE", "ALIGN", "BEHAVIOR", "BGCOLOR", "DIRECTION", "HEIGHT", "HSPACE", "LOOP", "SCROLLAMOUNT", "SCROLLDELAY", "WIDTH", "VSPACE", "onLoad", "STYLE", 0 },
{ "MENU", "onLoad", "STYLE", 0 }, { "MENU", "onLoad", "STYLE", 0 },
{ "META", "HTTP-EQUIV", "CONTENT", "NAME", "onLoad", "STYLE", 0 }, { "META", "HTTP-EQUIV", "CONTENT", "NAME", "onLoad", "STYLE", 0 },
{ "MULTICOL", "COLS", "GUTTER", "WIDTH", "onLoad", "STYLE", 0 }, { "MULTICOL", "COLS", "GUTTER", "WIDTH", "onLoad", "STYLE", 0 },
{ "NOFRAMES", "onLoad", "STYLE", 0 }, { "NOFRAMES", "onLoad", "STYLE", 0 },
{ "NOTE", "CLASS", "SRC", "onLoad", "STYLE", 0 }, { "NOTE", "CLASS", "SRC", "onLoad", "STYLE", 0 },
{ "OVERLAY", "SRC", "X", "Y", "HEIGHT", "WIDTH", "UNITS", "IMAGEMAP", "onLoad", "STYLE", 0 }, { "OVERLAY", "SRC", "X", "Y", "HEIGHT", "WIDTH", "UNITS", "IMAGEMAP", "onLoad", "STYLE", 0 },
{ "PARAM", "NAME", "VALUE", "onLoad", "STYLE", 0 }, { "PARAM", "NAME", "VALUE", "onLoad", "STYLE", 0 },
{ "RANGE", "FROM", "UNTIL", "onLoad", "STYLE", 0 }, { "RANGE", "FROM", "UNTIL", "onLoad", "STYLE", 0 },
{ "SCRIPT", "LANGUAGE", "onLoad", "STYLE", 0 }, { "SCRIPT", "LANGUAGE", "onLoad", "STYLE", 0 },
{ "SELECT", "NAME", "SIZE", "MULTIPLE", "WIDTH", "HEIGHT", "UNITS", "onLoad", "STYLE", 0 }, { "SELECT", "NAME", "SIZE", "MULTIPLE", "WIDTH", "HEIGHT", "UNITS", "onLoad", "STYLE", 0 },
{ "OPTION", "VALUE", "SHAPE", "onLoad", "STYLE", 0 }, { "OPTION", "VALUE", "SHAPE", "onLoad", "STYLE", 0 },
{ "SPACER", "TYPE", "SIZE", "WIDTH", "HEIGHT", "ALIGN", "onLoad", "STYLE", 0 }, { "SPACER", "TYPE", "SIZE", "WIDTH", "HEIGHT", "ALIGN", "onLoad", "STYLE", 0 },
{ "SPOT", "ID", "onLoad", "STYLE", 0 }, { "SPOT", "ID", "onLoad", "STYLE", 0 },
{ "TAB", "INDENT", "TO", "ALIGN", "DP", "onLoad", "STYLE", 0 }, { "TAB", "INDENT", "TO", "ALIGN", "DP", "onLoad", "STYLE", 0 },
{ "TABLE", "ALIGN", "WIDTH", "BORDER", "CELLPADDING", "CELLSPACING", "BGCOLOR", "VALIGN", "COLSPEC", "UNITS", "DP", "onLoad", "STYLE", 0 }, { "TABLE", "ALIGN", "WIDTH", "BORDER", "CELLPADDING", "CELLSPACING", "BGCOLOR", "VALIGN", "COLSPEC", "UNITS", "DP", "onLoad", "STYLE", 0 },
{ "TBODY", "CLASS", "ID", "onLoad", "STYLE", 0 }, { "TBODY", "CLASS", "ID", "onLoad", "STYLE", 0 },
{ "TD", "COLSPAN", "ROWSPAN", "ALIGN", "VALIGN", "BGCOLOR", "onLoad", "STYLE", 0 }, { "TD", "COLSPAN", "ROWSPAN", "ALIGN", "VALIGN", "BGCOLOR", "onLoad", "STYLE", 0 },
{ "TEXTAREA", "NAME", "COLS", "ROWS", "onLoad", "STYLE", 0 }, { "TEXTAREA", "NAME", "COLS", "ROWS", "onLoad", "STYLE", 0 },
{ "TEXTFLOW", "CLASS", "ID", "onLoad", "STYLE", 0 }, { "TEXTFLOW", "CLASS", "ID", "onLoad", "STYLE", 0 },
{ "TFOOT", "COLSPAN", "ROWSPAN", "ALIGN", "VALIGN", "BGCOLOR", "onLoad", "STYLE", 0 }, { "TFOOT", "COLSPAN", "ROWSPAN", "ALIGN", "VALIGN", "BGCOLOR", "onLoad", "STYLE", 0 },
{ "TH", "ALIGN", "CLASS", "ID", "onLoad", "STYLE", 0 }, { "TH", "ALIGN", "CLASS", "ID", "onLoad", "STYLE", 0 },
{ "TITLE", "onLoad", "STYLE", 0 }, { "TITLE", "onLoad", "STYLE", 0 },
{ "TR", "ALIGN", "VALIGN", "BGCOLOR", "CLASS", "onLoad", "STYLE", 0 }, { "TR", "ALIGN", "VALIGN", "BGCOLOR", "CLASS", "onLoad", "STYLE", 0 },
{ "UL", "SRC", "DINGBAT", "WRAP", "TYPE", "PLAIN", "onLoad", "STYLE", 0 }, { "UL", "SRC", "DINGBAT", "WRAP", "TYPE", "PLAIN", "onLoad", "STYLE", 0 },
{ 0 } { 0 }
}; };
@ -177,7 +177,7 @@ void random_tag(void)
int pn; int pn;
switch (R(32)) { switch (R(32)) {
case 0: putchar(R(256)); case 0: putchar(R(256));
case 1: break; case 1: break;
default: putchar(' '); default: putchar(' ');
} }
@ -189,7 +189,7 @@ void random_tag(void)
printf("%s", tags[tn][pn]); printf("%s", tags[tn][pn]);
switch (R(32)) { switch (R(32)) {
case 0: putchar(R(256)); case 0: putchar(R(256));
case 1: break; case 1: break;
default: putchar('='); default: putchar('=');
} }

2
src/ecmascript/see/document.c
View File

@ -216,7 +216,7 @@ js_document_write_do(struct SEE_interpreter *interp, struct SEE_object *self,
for (; i < argc; ++i) { for (; i < argc; ++i) {
unsigned char *code; unsigned char *code;
code = SEE_value_to_unsigned_char(interp, argv[i]); code = SEE_value_to_unsigned_char(interp, argv[i]);
if (code) { if (code) {

2
src/ecmascript/see/window.c
View File

@ -105,7 +105,7 @@ window_get(struct SEE_interpreter *interp, struct SEE_object *o,
SEE_SET_BOOLEAN(res, 0); SEE_SET_BOOLEAN(res, 0);
} else if (p == s_self || p == s_parent || p == s_top) { } else if (p == s_self || p == s_parent || p == s_top) {
SEE_SET_OBJECT(res, o); SEE_SET_OBJECT(res, o);
#if 0 #if 0
} else if (p == s_parent || p == s_top) { } else if (p == s_parent || p == s_top) {
struct document_view *doc_view = vs->doc_view; struct document_view *doc_view = vs->doc_view;
struct document_view *top_view = doc_view->session->doc_view; struct document_view *top_view = doc_view->session->doc_view;

46
src/encoding/LzmaDecode.c
View File

@ -1,21 +1,21 @@
/* /*
LzmaDecode.c LzmaDecode.c
LZMA Decoder (optimized for Speed version) LZMA Decoder (optimized for Speed version)
LZMA SDK 4.22 Copyright (c) 1999-2005 Igor Pavlov (2005-06-10) LZMA SDK 4.22 Copyright (c) 1999-2005 Igor Pavlov (2005-06-10)
http://www.7-zip.org/ http://www.7-zip.org/
LZMA SDK is licensed under two licenses: LZMA SDK is licensed under two licenses:
1) GNU Lesser General Public License (GNU LGPL) 1) GNU Lesser General Public License (GNU LGPL)
2) Common Public License (CPL) 2) Common Public License (CPL)
It means that you can select one of these two licenses and It means that you can select one of these two licenses and
follow rules of that license. follow rules of that license.
SPECIAL EXCEPTION: SPECIAL EXCEPTION:
Igor Pavlov, as the author of this Code, expressly permits you to Igor Pavlov, as the author of this Code, expressly permits you to
statically or dynamically link your Code (or bind by name) to the statically or dynamically link your Code (or bind by name) to the
interfaces of this file without subjecting your linked Code to the interfaces of this file without subjecting your linked Code to the
terms of the CPL or GNU LGPL. Any modifications or additions terms of the CPL or GNU LGPL. Any modifications or additions
to this file, however, are subject to the LGPL or CPL terms. to this file, however, are subject to the LGPL or CPL terms.
*/ */
@ -50,7 +50,7 @@
#define RC_TEST { if (Buffer == BufferLim) return LZMA_RESULT_DATA_ERROR; } #define RC_TEST { if (Buffer == BufferLim) return LZMA_RESULT_DATA_ERROR; }
#define RC_INIT(buffer, bufferSize) Buffer = buffer; BufferLim = buffer + bufferSize; RC_INIT2 #define RC_INIT(buffer, bufferSize) Buffer = buffer; BufferLim = buffer + bufferSize; RC_INIT2
#endif #endif
#define RC_NORMALIZE if (Range < kTopValue) { RC_TEST; Range <<= 8; Code = (Code << 8) | RC_READ_BYTE; } #define RC_NORMALIZE if (Range < kTopValue) { RC_TEST; Range <<= 8; Code = (Code << 8) | RC_READ_BYTE; }
@ -61,9 +61,9 @@
#define RC_GET_BIT2(p, mi, A0, A1) IfBit0(p) \ #define RC_GET_BIT2(p, mi, A0, A1) IfBit0(p) \
{ UpdateBit0(p); mi <<= 1; A0; } else \ { UpdateBit0(p); mi <<= 1; A0; } else \
{ UpdateBit1(p); mi = (mi + mi) + 1; A1; } { UpdateBit1(p); mi = (mi + mi) + 1; A1; }
#define RC_GET_BIT(p, mi) RC_GET_BIT2(p, mi, ; , ;) #define RC_GET_BIT(p, mi) RC_GET_BIT2(p, mi, ; , ;)
#define RangeDecoderBitTreeDecode(probs, numLevels, res) \ #define RangeDecoderBitTreeDecode(probs, numLevels, res) \
{ int i = numLevels; res = 1; \ { int i = numLevels; res = 1; \
@ -86,7 +86,7 @@
#define LenLow (LenChoice2 + 1) #define LenLow (LenChoice2 + 1)
#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits)) #define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits)) #define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
#define kNumLenProbs (LenHigh + kLenNumHighSymbols) #define kNumLenProbs (LenHigh + kLenNumHighSymbols)
#define kNumStates 12 #define kNumStates 12
@ -172,7 +172,7 @@ int LzmaDecode(CLzmaDecoderState *vs,
int lc = vs->Properties.lc; int lc = vs->Properties.lc;
#ifdef _LZMA_OUT_READ #ifdef _LZMA_OUT_READ
UInt32 Range = vs->Range; UInt32 Range = vs->Range;
UInt32 Code = vs->Code; UInt32 Code = vs->Code;
#ifdef _LZMA_IN_CB #ifdef _LZMA_IN_CB
@ -214,7 +214,7 @@ int LzmaDecode(CLzmaDecoderState *vs,
UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + vs->Properties.lp)); UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + vs->Properties.lp));
UInt32 i; UInt32 i;
for (i = 0; i < numProbs; i++) for (i = 0; i < numProbs; i++)
p[i] = kBitModelTotal >> 1; p[i] = kBitModelTotal >> 1;
rep0 = rep1 = rep2 = rep3 = 1; rep0 = rep1 = rep2 = rep3 = 1;
state = 0; state = 0;
globalPos = 0; globalPos = 0;
@ -265,7 +265,7 @@ int LzmaDecode(CLzmaDecoderState *vs,
for (i = 0; i < numProbs; i++) for (i = 0; i < numProbs; i++)
p[i] = kBitModelTotal >> 1; p[i] = kBitModelTotal >> 1;
} }
#ifdef _LZMA_IN_CB #ifdef _LZMA_IN_CB
RC_INIT; RC_INIT;
#else #else
@ -279,7 +279,7 @@ int LzmaDecode(CLzmaDecoderState *vs,
CProb *prob; CProb *prob;
UInt32 bound; UInt32 bound;
int posState = (int)( int posState = (int)(
(nowPos (nowPos
#ifdef _LZMA_OUT_READ #ifdef _LZMA_OUT_READ
+ globalPos + globalPos
#endif #endif
@ -291,9 +291,9 @@ int LzmaDecode(CLzmaDecoderState *vs,
{ {
int symbol = 1; int symbol = 1;
UpdateBit0(prob) UpdateBit0(prob)
prob = p + Literal + (LZMA_LIT_SIZE * prob = p + Literal + (LZMA_LIT_SIZE *
((( (((
(nowPos (nowPos
#ifdef _LZMA_OUT_READ #ifdef _LZMA_OUT_READ
+ globalPos + globalPos
#endif #endif
@ -342,7 +342,7 @@ int LzmaDecode(CLzmaDecoderState *vs,
else if (state < 10) state -= 3; else if (state < 10) state -= 3;
else state -= 6; else state -= 6;
} }
else else
{ {
UpdateBit1(prob); UpdateBit1(prob);
prob = p + IsRep + state; prob = p + IsRep + state;
@ -369,14 +369,14 @@ int LzmaDecode(CLzmaDecoderState *vs,
UInt32 pos; UInt32 pos;
#endif #endif
UpdateBit0(prob); UpdateBit0(prob);
#ifdef _LZMA_OUT_READ #ifdef _LZMA_OUT_READ
if (distanceLimit == 0) if (distanceLimit == 0)
#else #else
if (nowPos == 0) if (nowPos == 0)
#endif #endif
return LZMA_RESULT_DATA_ERROR; return LZMA_RESULT_DATA_ERROR;
state = state < kNumLitStates ? 9 : 11; state = state < kNumLitStates ? 9 : 11;
#ifdef _LZMA_OUT_READ #ifdef _LZMA_OUT_READ
pos = dictionaryPos - rep0; pos = dictionaryPos - rep0;
@ -412,7 +412,7 @@ int LzmaDecode(CLzmaDecoderState *vs,
UpdateBit0(prob); UpdateBit0(prob);
distance = rep1; distance = rep1;
} }
else else
{ {
UpdateBit1(prob); UpdateBit1(prob);
prob = p + IsRepG2 + state; prob = p + IsRepG2 + state;
@ -473,7 +473,7 @@ int LzmaDecode(CLzmaDecoderState *vs,
int posSlot; int posSlot;
state += kNumLitStates; state += kNumLitStates;
prob = p + PosSlot + prob = p + PosSlot +
((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) <<
kNumPosSlotBits); kNumPosSlotBits);
RangeDecoderBitTreeDecode(prob, kNumPosSlotBits, posSlot); RangeDecoderBitTreeDecode(prob, kNumPosSlotBits, posSlot);
if (posSlot >= kStartPosModelIndex) if (posSlot >= kStartPosModelIndex)
@ -528,7 +528,7 @@ int LzmaDecode(CLzmaDecoderState *vs,
len += kMatchMinLen; len += kMatchMinLen;
#ifdef _LZMA_OUT_READ #ifdef _LZMA_OUT_READ
if (rep0 > distanceLimit) if (rep0 > distanceLimit)
#else #else
if (rep0 > nowPos) if (rep0 > nowPos)
#endif #endif

14
src/encoding/LzmaDecode.h
View File

@ -1,4 +1,4 @@
/* /*
LzmaDecode.h LzmaDecode.h
LZMA Decoder interface LZMA Decoder interface
@ -8,14 +8,14 @@
LZMA SDK is licensed under two licenses: LZMA SDK is licensed under two licenses:
1) GNU Lesser General Public License (GNU LGPL) 1) GNU Lesser General Public License (GNU LGPL)
2) Common Public License (CPL) 2) Common Public License (CPL)
It means that you can select one of these two licenses and It means that you can select one of these two licenses and
follow rules of that license. follow rules of that license.
SPECIAL EXCEPTION: SPECIAL EXCEPTION:
Igor Pavlov, as the author of this code, expressly permits you to Igor Pavlov, as the author of this code, expressly permits you to
statically or dynamically link your code (or bind by name) to the statically or dynamically link your code (or bind by name) to the
interfaces of this file without subjecting your linked code to the interfaces of this file without subjecting your linked code to the
terms of the CPL or GNU LGPL. Any modifications or additions terms of the CPL or GNU LGPL. Any modifications or additions
to this file, however, are subject to the LGPL or CPL terms. to this file, however, are subject to the LGPL or CPL terms.
*/ */
@ -29,7 +29,7 @@
/* Use read function for output data */ /* Use read function for output data */
/* #define _LZMA_PROB32 */ /* #define _LZMA_PROB32 */
/* It can increase speed on some 32-bit CPUs, /* It can increase speed on some 32-bit CPUs,
but memory usage will be doubled in that case */ but memory usage will be doubled in that case */
#define _LZMA_LOC_OPT 1 #define _LZMA_LOC_OPT 1

4
src/osdep/win32/overrides.c
View File

@ -210,8 +210,8 @@ win32_write(int fd, const void *buf, unsigned len)
case FDT_TERMINAL: case FDT_TERMINAL:
if (isatty(STDOUT_FILENO) > 0) { if (isatty(STDOUT_FILENO) > 0) {
#if 0 #if 0
WriteConsole ((HANDLE) fd, buf, len, &written, NULL); WriteConsole ((HANDLE) fd, buf, len, &written, NULL);
rc = written; rc = written;
#endif #endif
rc = VT100_decode((HANDLE) fd, buf, len); rc = VT100_decode((HANDLE) fd, buf, len);

2
src/util/file.c
View File

@ -274,7 +274,7 @@ safe_mkstemp(unsigned char *template)
{ {
#ifndef CONFIG_OS_WIN32 #ifndef CONFIG_OS_WIN32
mode_t saved_mask = umask(S_IXUSR | S_IRWXG | S_IRWXO); mode_t saved_mask = umask(S_IXUSR | S_IRWXG | S_IRWXO);
#endif #endif
int fd = mkstemp(template); int fd = mkstemp(template);
#ifndef CONFIG_OS_WIN32 #ifndef CONFIG_OS_WIN32
umask(saved_mask); umask(saved_mask);

2
src/viewer/dump/dump.c
View File

@ -125,7 +125,7 @@ dump_formatted(int fd, struct download *download, struct cache_entry *cached)
render_document(&vs, &formatted, &o); render_document(&vs, &formatted, &o);
switch(o.color_mode) { switch(o.color_mode) {
case COLOR_MODE_DUMP: case COLOR_MODE_DUMP:
case COLOR_MODE_MONO: /* FIXME: inversion */ case COLOR_MODE_MONO: /* FIXME: inversion */
dump_to_file(formatted.document, fd); dump_to_file(formatted.document, fd);
break; break;
case COLOR_MODE_16: case COLOR_MODE_16:

2
src/viewer/text/form.c
View File

@ -980,7 +980,7 @@ get_form_uri(struct session *ses, struct document_view *doc_view,
if (fc->type == FC_RESET) { if (fc->type == FC_RESET) {
do_reset_form(doc_view, form); do_reset_form(doc_view, form);
return NULL; return NULL;
} }
if (!form->action if (!form->action
|| !init_string(&data)) || !init_string(&data))

2
src/viewer/text/link.c
View File

@ -283,7 +283,7 @@ clear_link(struct terminal *term, struct document_view *doc_view)
if (is_in_box(&doc_view->box, x + xpos, y + ypos)){ if (is_in_box(&doc_view->box, x + xpos, y + ypos)){
struct screen_char *ch; struct screen_char *ch;
ch = get_char(term, x + xpos, y + ypos); ch = get_char(term, x + xpos, y + ypos);
copy_struct(ch, &doc_view->document->data[y].chars[x]); copy_struct(ch, &doc_view->document->data[y].chars[x]);
} }