Date: Sun, 4 Feb 2018 09:16:23 +0000 (UTC) From: Matthew Seaman <matthew@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460879 - in head/textproc/sphinxsearch: . files Message-ID: <201802040916.w149GNKe092737@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: matthew Date: Sun Feb 4 09:16:23 2018 New Revision: 460879 URL: https://svnweb.freebsd.org/changeset/ports/460879 Log: Patches to make the code compatible with clang-6.0 / C++17 -- this will fix the build on FreeBSD 12.0 - delete the 'register' keyword everywhere - Add whitespace between adjacent quoted strings - Update the offsetof() macro to cast the result to int Reported by: pkg-fallout Added: head/textproc/sphinxsearch/files/patch-src_llsphinxjson.c (contents, props changed) head/textproc/sphinxsearch/files/patch-src_llsphinxql.c (contents, props changed) head/textproc/sphinxsearch/files/patch-src_searchd.cpp (contents, props changed) head/textproc/sphinxsearch/files/patch-src_sphinx.cpp (contents, props changed) head/textproc/sphinxsearch/files/patch-src_sphinx.h (contents, props changed) head/textproc/sphinxsearch/files/patch-src_sphinxaot.cpp (contents, props changed) head/textproc/sphinxsearch/files/patch-src_sphinxint.h (contents, props changed) head/textproc/sphinxsearch/files/patch-src_sphinxplugin.cpp (contents, props changed) head/textproc/sphinxsearch/files/patch-src_sphinxrt.cpp (contents, props changed) head/textproc/sphinxsearch/files/patch-src_sphinxsort.cpp (contents, props changed) head/textproc/sphinxsearch/files/patch-src_sphinxstd.h (contents, props changed) head/textproc/sphinxsearch/files/patch-src_sphinxstemen.cpp (contents, props changed) head/textproc/sphinxsearch/files/patch-src_sphinxstemru.inl (contents, props changed) head/textproc/sphinxsearch/files/patch-src_sphinxutils.cpp (contents, props changed) Modified: head/textproc/sphinxsearch/Makefile Modified: head/textproc/sphinxsearch/Makefile ============================================================================== --- head/textproc/sphinxsearch/Makefile Sun Feb 4 09:02:16 2018 (r460878) +++ head/textproc/sphinxsearch/Makefile Sun Feb 4 09:16:23 2018 (r460879) @@ -7,7 +7,7 @@ PORTNAME= sphinxsearch PORTVERSION= 2.2.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc databases MASTER_SITES= http://sphinxsearch.com/files/ \ http://snowball.tartarus.org/dist/:libstemmer Added: head/textproc/sphinxsearch/files/patch-src_llsphinxjson.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sphinxsearch/files/patch-src_llsphinxjson.c Sun Feb 4 09:16:23 2018 (r460879) @@ -0,0 +1,89 @@ +--- src/llsphinxjson.c.orig 2018-02-03 14:14:04 UTC ++++ src/llsphinxjson.c +@@ -724,9 +724,9 @@ extern int yy2lex (yyscan_t yyscanner); + */ + YY_DECL + { +- register yy_state_type yy_current_state; +- register char *yy_cp, *yy_bp; +- register int yy_act; ++ yy_state_type yy_current_state; ++ char *yy_cp, *yy_bp; ++ int yy_act; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + #line 28 "sphinxjson.l" +@@ -776,7 +776,7 @@ YY_DECL + yy_match: + do + { +- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; ++ YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + if ( yy_accept[yy_current_state] ) + { + yyg->yy_last_accepting_state = yy_current_state; +@@ -1053,9 +1053,9 @@ case YY_STATE_EOF(ccomment): + static int yy_get_next_buffer (yyscan_t yyscanner) + { + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; +- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; +- register char *source = yyg->yytext_ptr; +- register int number_to_move, i; ++ char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; ++ char *source = yyg->yytext_ptr; ++ int number_to_move, i; + int ret_val; + + if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) +@@ -1187,15 +1187,15 @@ static int yy_get_next_buffer (yyscan_t yyscanner) + + static yy_state_type yy_get_previous_state (yyscan_t yyscanner) + { +- register yy_state_type yy_current_state; +- register char *yy_cp; ++ yy_state_type yy_current_state; ++ char *yy_cp; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + yy_current_state = yyg->yy_start; + + for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp ) + { +- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); ++ YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + if ( yy_accept[yy_current_state] ) + { + yyg->yy_last_accepting_state = yy_current_state; +@@ -1220,11 +1220,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) + */ + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner) + { +- register int yy_is_jam; ++ int yy_is_jam; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */ +- register char *yy_cp = yyg->yy_c_buf_p; ++ char *yy_cp = yyg->yy_c_buf_p; + +- register YY_CHAR yy_c = 1; ++ YY_CHAR yy_c = 1; + if ( yy_accept[yy_current_state] ) + { + yyg->yy_last_accepting_state = yy_current_state; +@@ -1986,7 +1986,7 @@ int yy2lex_destroy (yyscan_t yyscanner) + #ifndef yytext_ptr + static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner) + { +- register int i; ++ int i; + for ( i = 0; i < n; ++i ) + s1[i] = s2[i]; + } +@@ -1995,7 +1995,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * + #ifdef YY_NEED_STRLEN + static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) + { +- register int n; ++ int n; + for ( n = 0; s[n]; ++n ) + ; + Added: head/textproc/sphinxsearch/files/patch-src_llsphinxql.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sphinxsearch/files/patch-src_llsphinxql.c Sun Feb 4 09:16:23 2018 (r460879) @@ -0,0 +1,89 @@ +--- src/llsphinxql.c.orig 2018-02-03 15:30:11 UTC ++++ src/llsphinxql.c +@@ -1142,9 +1142,9 @@ extern int yylex (yyscan_t yyscanner); + */ + YY_DECL + { +- register yy_state_type yy_current_state; +- register char *yy_cp, *yy_bp; +- register int yy_act; ++ yy_state_type yy_current_state; ++ char *yy_cp, *yy_bp; ++ int yy_act; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + #line 31 "sphinxql.l" +@@ -1194,7 +1194,7 @@ YY_DECL + yy_match: + do + { +- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; ++ YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + if ( yy_accept[yy_current_state] ) + { + yyg->yy_last_accepting_state = yy_current_state; +@@ -2080,9 +2080,9 @@ case YY_STATE_EOF(ccomment): + static int yy_get_next_buffer (yyscan_t yyscanner) + { + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; +- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; +- register char *source = yyg->yytext_ptr; +- register int number_to_move, i; ++ char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; ++ char *source = yyg->yytext_ptr; ++ int number_to_move, i; + int ret_val; + + if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) +@@ -2214,15 +2214,15 @@ static int yy_get_next_buffer (yyscan_t yyscanner) + + static yy_state_type yy_get_previous_state (yyscan_t yyscanner) + { +- register yy_state_type yy_current_state; +- register char *yy_cp; ++ yy_state_type yy_current_state; ++ char *yy_cp; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + yy_current_state = yyg->yy_start; + + for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp ) + { +- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); ++ YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + if ( yy_accept[yy_current_state] ) + { + yyg->yy_last_accepting_state = yy_current_state; +@@ -2247,11 +2247,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) + */ + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner) + { +- register int yy_is_jam; ++ int yy_is_jam; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */ +- register char *yy_cp = yyg->yy_c_buf_p; ++ char *yy_cp = yyg->yy_c_buf_p; + +- register YY_CHAR yy_c = 1; ++ YY_CHAR yy_c = 1; + if ( yy_accept[yy_current_state] ) + { + yyg->yy_last_accepting_state = yy_current_state; +@@ -3013,7 +3013,7 @@ int yylex_destroy (yyscan_t yyscanner) + #ifndef yytext_ptr + static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner) + { +- register int i; ++ int i; + for ( i = 0; i < n; ++i ) + s1[i] = s2[i]; + } +@@ -3022,7 +3022,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * + #ifdef YY_NEED_STRLEN + static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) + { +- register int n; ++ int n; + for ( n = 0; s[n]; ++n ) + ; + Added: head/textproc/sphinxsearch/files/patch-src_searchd.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sphinxsearch/files/patch-src_searchd.cpp Sun Feb 4 09:16:23 2018 (r460879) @@ -0,0 +1,23 @@ +--- src/searchd.cpp.orig 2018-02-03 10:33:59 UTC ++++ src/searchd.cpp +@@ -8580,16 +8580,16 @@ struct GenericMatchSort_fn : public CSphMatchComparato + + case SPH_KEYPART_INT: + { +- register SphAttr_t aa = a->GetAttr ( m_tLocator[i] ); +- register SphAttr_t bb = b->GetAttr ( m_tLocator[i] ); ++ SphAttr_t aa = a->GetAttr ( m_tLocator[i] ); ++ SphAttr_t bb = b->GetAttr ( m_tLocator[i] ); + if ( aa==bb ) + continue; + return ( ( m_uAttrDesc>>i ) & 1 ) ^ ( aa < bb ); + } + case SPH_KEYPART_FLOAT: + { +- register float aa = a->GetAttrFloat ( m_tLocator[i] ); +- register float bb = b->GetAttrFloat ( m_tLocator[i] ); ++ float aa = a->GetAttrFloat ( m_tLocator[i] ); ++ float bb = b->GetAttrFloat ( m_tLocator[i] ); + if ( aa==bb ) + continue; + return ( ( m_uAttrDesc>>i ) & 1 ) ^ ( aa < bb ); Added: head/textproc/sphinxsearch/files/patch-src_sphinx.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sphinxsearch/files/patch-src_sphinx.cpp Sun Feb 4 09:16:23 2018 (r460879) @@ -0,0 +1,111 @@ +--- src/sphinx.cpp.orig 2018-02-03 10:17:51 UTC ++++ src/sphinx.cpp +@@ -8346,8 +8346,8 @@ void CSphReader::ResetError() + #if PARANOID + + #define SPH_VARINT_DECODE(_type,_getexpr) \ +- register DWORD b = 0; \ +- register _type v = 0; \ ++ DWORD b = 0; \ ++ _type v = 0; \ + int it = 0; \ + do { b = _getexpr; v = ( v<<7 ) + ( b&0x7f ); it++; } while ( b&0x80 ); \ + assert ( (it-1)*7<=sizeof(_type)*8 ); \ +@@ -8356,8 +8356,8 @@ void CSphReader::ResetError() + #else + + #define SPH_VARINT_DECODE(_type,_getexpr) \ +- register DWORD b = _getexpr; \ +- register _type res = 0; \ ++ DWORD b = _getexpr; \ ++ _type res = 0; \ + while ( b & 0x80 ) \ + { \ + res = ( res<<7 ) + ( b & 0x7f ); \ +@@ -8722,8 +8722,8 @@ SphWordID_t CSphBin::ReadVLB () + + DWORD CSphBin::UnzipInt () + { +- register int b = 0; +- register DWORD v = 0; ++ int b = 0; ++ DWORD v = 0; + do + { + b = ReadByte(); +@@ -8736,8 +8736,8 @@ DWORD CSphBin::UnzipInt () + + SphOffset_t CSphBin::UnzipOffset () + { +- register int b = 0; +- register SphOffset_t v = 0; ++ int b = 0; ++ SphOffset_t v = 0; + do + { + b = ReadByte(); +@@ -11536,8 +11536,8 @@ bool CSphHitBuilder::cidxDone ( int iMemLimit, int iMi + + inline int encodeVLB ( BYTE * buf, DWORD v ) + { +- register BYTE b; +- register int n = 0; ++ BYTE b; ++ int n = 0; + + do + { +@@ -23566,9 +23566,9 @@ SphWordID_t CSphDictKeywords::HitblockGetID ( const ch + } + + // crc matches, check keyword +- register int iWordLen = iLen; +- register const char * a = pEntry->m_pKeyword; +- register const char * b = sWord; ++ int iWordLen = iLen; ++ const char * a = pEntry->m_pKeyword; ++ const char * b = sWord; + while ( *a==*b && iWordLen-- ) + { + if ( !*a || !iWordLen ) +@@ -24874,7 +24874,7 @@ static inline DWORD HtmlEntityHash ( const BYTE * str, + 421, 421, 421, 421, 421, 421, 421 + }; + +- register int hval = len; ++ int hval = len; + switch ( hval ) + { + default: hval += asso_values [ str[4] ]; +@@ -25257,11 +25257,11 @@ static inline int HtmlEntityLookup ( const BYTE * str, + + if ( len<=MAX_WORD_LENGTH && len>=MIN_WORD_LENGTH ) + { +- register int key = HtmlEntityHash ( str, len ); ++ int key = HtmlEntityHash ( str, len ); + if ( key<=MAX_HASH_VALUE && key>=0 ) + if ( len==lengthtable[key] ) + { +- register const char * s = wordlist[key].m_sName; ++ const char * s = wordlist[key].m_sName; + if ( *str==*s && !memcmp ( str+1, s+1, len-1 ) ) + return wordlist[key].m_iCode; + } +@@ -27817,7 +27817,7 @@ const char * CSphSource_SQL::SqlUnpackColumn ( int iFi + { + m_bUnpackFailed = true; + sphWarn ( "failed to unpack '%s', invalid column size (size=%d), " +- "docid="DOCID_FMT, SqlFieldName(iIndex), iPackedLen, m_tDocInfo.m_uDocID ); ++ "docid=" DOCID_FMT, SqlFieldName(iIndex), iPackedLen, m_tDocInfo.m_uDocID ); + } + return NULL; + } +@@ -27833,7 +27833,7 @@ const char * CSphSource_SQL::SqlUnpackColumn ( int iFi + { + m_bUnpackOverflow = true; + sphWarn ( "failed to unpack '%s', column size limit exceeded (size=%d)," +- " docid="DOCID_FMT, SqlFieldName(iIndex), (int)uSize, m_tDocInfo.m_uDocID ); ++ " docid=" DOCID_FMT, SqlFieldName(iIndex), (int)uSize, m_tDocInfo.m_uDocID ); + } + return NULL; + } Added: head/textproc/sphinxsearch/files/patch-src_sphinx.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sphinxsearch/files/patch-src_sphinx.h Sun Feb 4 09:16:23 2018 (r460879) @@ -0,0 +1,11 @@ +--- src/sphinx.h.orig 2018-02-03 10:16:36 UTC ++++ src/sphinx.h +@@ -433,7 +433,7 @@ class CSphLowercaser (public) + { + if ( iCode<0 || iCode>=MAX_CODE ) + return iCode; +- register int * pChunk = m_pChunk [ iCode >> CHUNK_BITS ]; ++ int * pChunk = m_pChunk [ iCode >> CHUNK_BITS ]; + if ( pChunk ) + return pChunk [ iCode & CHUNK_MASK ]; + return 0; Added: head/textproc/sphinxsearch/files/patch-src_sphinxaot.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sphinxsearch/files/patch-src_sphinxaot.cpp Sun Feb 4 09:16:23 2018 (r460879) @@ -0,0 +1,11 @@ +--- src/sphinxaot.cpp.orig 2018-02-03 10:35:17 UTC ++++ src/sphinxaot.cpp +@@ -1133,7 +1133,7 @@ static inline int Utf8ToWin1251 ( BYTE * pOut, const B + assert ( pWord[1]>=0x80 && pWord[1]<0xC0 ); + + // table index D0 80..BF to 0..3F, and D1 80..BF to 40..7F +- register BYTE uWin = dTable [ ( pWord[1] & 0x7F ) + ( ( pWord[0] & 1 )<<6 ) ]; ++ BYTE uWin = dTable [ ( pWord[1] & 0x7F ) + ( ( pWord[0] & 1 )<<6 ) ]; + pWord += 2; + + if ( !uWin ) Added: head/textproc/sphinxsearch/files/patch-src_sphinxint.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sphinxsearch/files/patch-src_sphinxint.h Sun Feb 4 09:16:23 2018 (r460879) @@ -0,0 +1,13 @@ +--- src/sphinxint.h.orig 2018-02-03 10:17:12 UTC ++++ src/sphinxint.h +@@ -1074,8 +1074,8 @@ inline int FindBit ( DWORD uValue ) + + inline int sphEncodeVLB8 ( BYTE * buf, uint64_t v ) + { +- register BYTE b; +- register int n = 0; ++ BYTE b; ++ int n = 0; + + do + { Added: head/textproc/sphinxsearch/files/patch-src_sphinxplugin.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sphinxsearch/files/patch-src_sphinxplugin.cpp Sun Feb 4 09:16:23 2018 (r460879) @@ -0,0 +1,11 @@ +--- src/sphinxplugin.cpp.orig 2016-07-19 10:42:18 UTC ++++ src/sphinxplugin.cpp +@@ -219,7 +219,7 @@ static bool PluginLoadSymbols ( void * pDesc, const Sy + + #if !USE_WINDOWS + #define offsetof(T, M) \ +- (reinterpret_cast<char*>(&(((T*)1000)->M)) - reinterpret_cast<char*>(1000)) ++ ((int)(reinterpret_cast<char*>(&(((T*)1000)->M)) - reinterpret_cast<char*>(1000))) + #endif + + static SymbolDesc_t g_dSymbolsUDF[] = Added: head/textproc/sphinxsearch/files/patch-src_sphinxrt.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sphinxsearch/files/patch-src_sphinxrt.cpp Sun Feb 4 09:16:23 2018 (r460879) @@ -0,0 +1,11 @@ +--- src/sphinxrt.cpp.orig 2018-02-03 10:48:40 UTC ++++ src/sphinxrt.cpp +@@ -4796,7 +4796,7 @@ int RtIndex_t::DebugCheck ( FILE * fp ) + if ( !tWord.m_uDocs || !tWord.m_uHits || tWord.m_uHits<tWord.m_uDocs ) + { + sWord[sizeof(sWord)-1] = '\0'; +- LOC_FAIL(( fp, "invalid docs/hits (segment=%d, word=%d, read_wordid="UINT64_FMT ++ LOC_FAIL(( fp, "invalid docs/hits (segment=%d, word=%d, read_wordid=" UINT64_FMT + ", read_word=%s, docs=%u, hits=%u)", + iSegment, nWordsRead, (uint64_t)tWord.m_uWordID, + sWord+1, tWord.m_uDocs, tWord.m_uHits )); Added: head/textproc/sphinxsearch/files/patch-src_sphinxsort.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sphinxsearch/files/patch-src_sphinxsort.cpp Sun Feb 4 09:16:23 2018 (r460879) @@ -0,0 +1,22 @@ +--- src/sphinxsort.cpp.orig 2018-02-03 10:36:00 UTC ++++ src/sphinxsort.cpp +@@ -3395,15 +3395,15 @@ struct MatchExpr_fn : public ISphMatchComparator + case SPH_KEYPART_WEIGHT: SPH_TEST_PAIR ( a.m_iWeight, b.m_iWeight, _idx ); break; \ + case SPH_KEYPART_INT: \ + { \ +- register SphAttr_t aa = a.GetAttr ( t.m_tLocator[_idx] ); \ +- register SphAttr_t bb = b.GetAttr ( t.m_tLocator[_idx] ); \ ++ SphAttr_t aa = a.GetAttr ( t.m_tLocator[_idx] ); \ ++ SphAttr_t bb = b.GetAttr ( t.m_tLocator[_idx] ); \ + SPH_TEST_PAIR ( aa, bb, _idx ); \ + break; \ + } \ + case SPH_KEYPART_FLOAT: \ + { \ +- register float aa = a.GetAttrFloat ( t.m_tLocator[_idx] ); \ +- register float bb = b.GetAttrFloat ( t.m_tLocator[_idx] ); \ ++ float aa = a.GetAttrFloat ( t.m_tLocator[_idx] ); \ ++ float bb = b.GetAttrFloat ( t.m_tLocator[_idx] ); \ + SPH_TEST_PAIR ( aa, bb, _idx ) \ + break; \ + } \ Added: head/textproc/sphinxsearch/files/patch-src_sphinxstd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sphinxsearch/files/patch-src_sphinxstd.h Sun Feb 4 09:16:23 2018 (r460879) @@ -0,0 +1,11 @@ +--- src/sphinxstd.h.orig 2018-02-03 10:22:51 UTC ++++ src/sphinxstd.h +@@ -274,7 +274,7 @@ inline int sphBitCount ( DWORD n ) + // MIT HACKMEM count + // works for 32-bit numbers only + // fix last line for 64-bit numbers +- register DWORD tmp; ++ DWORD tmp; + tmp = n - ((n >> 1) & 033333333333) - ((n >> 2) & 011111111111); + return ( (tmp + (tmp >> 3) ) & 030707070707) % 63; + } Added: head/textproc/sphinxsearch/files/patch-src_sphinxstemen.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sphinxsearch/files/patch-src_sphinxstemen.cpp Sun Feb 4 09:16:23 2018 (r460879) @@ -0,0 +1,11 @@ +--- src/sphinxstemen.cpp.orig 2018-02-03 10:36:47 UTC ++++ src/sphinxstemen.cpp +@@ -47,7 +47,7 @@ static unsigned char vowel_map[] = + + static inline int stem_en_id ( unsigned char l ) + { +- register unsigned char * v = stem_en_doubles; ++ unsigned char * v = stem_en_doubles; + while ( *v && *v!=l ) v++; + return ( *v==l ) ? 1 : 0; + } Added: head/textproc/sphinxsearch/files/patch-src_sphinxstemru.inl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sphinxsearch/files/patch-src_sphinxstemru.inl Sun Feb 4 09:16:23 2018 (r460879) @@ -0,0 +1,20 @@ +--- src/sphinxstemru.inl.orig 2018-02-03 14:10:20 UTC ++++ src/sphinxstemru.inl +@@ -413,7 +413,7 @@ STEM_RU_FUNC_I(ru_noun) + + static int LOC_PREFIX(stem_ru_adjectival) ( LOC_CHAR_TYPE * word, int len ) + { +- register int i = LOC_PREFIX(stem_ru_adj_i) ( word, len ); ++ int i = LOC_PREFIX(stem_ru_adj_i) ( word, len ); + if ( i ) + i += LOC_PREFIX(stem_ru_part_i) ( word, len-i ); + return i; +@@ -422,7 +422,7 @@ static int LOC_PREFIX(stem_ru_adjectival) ( LOC_CHAR_T + + static int LOC_PREFIX(stem_ru_verb_ov) ( LOC_CHAR_TYPE * word, int len ) + { +- register int i = LOC_PREFIX(stem_ru_verb_i) ( word, len ); ++ int i = LOC_PREFIX(stem_ru_verb_i) ( word, len ); + if ( i && (len>=i+2) && word[len-i-2] == RUS::O && word[len-i-1] == RUS::V ) + return i+2; + return i; Added: head/textproc/sphinxsearch/files/patch-src_sphinxutils.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sphinxsearch/files/patch-src_sphinxutils.cpp Sun Feb 4 09:16:23 2018 (r460879) @@ -0,0 +1,16 @@ +--- src/sphinxutils.cpp.orig 2018-02-03 10:25:41 UTC ++++ src/sphinxutils.cpp +@@ -2103,11 +2103,11 @@ void sphBacktrace ( int iFD, bool bSafe ) + #endif + + #ifdef CONFIGURE_FLAGS +- sphSafeInfo ( iFD, "Configured with flags: "CONFIGURE_FLAGS ); ++ sphSafeInfo ( iFD, "Configured with flags: " CONFIGURE_FLAGS ); + #endif + + #ifdef OS_UNAME +- sphSafeInfo ( iFD, "Host OS is "OS_UNAME ); ++ sphSafeInfo ( iFD, "Host OS is " OS_UNAME ); + #endif + + bool bOk = true;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802040916.w149GNKe092737>