60 lines
2.4 KiB
Plaintext
60 lines
2.4 KiB
Plaintext
$OpenBSD: patch-source_tools_genrb_derb_c,v 1.1 2012/12/08 13:18:46 ajacoutot Exp $
|
|
|
|
On OpenBSD, truncate is already defined in <sys/types.h>.
|
|
|
|
--- source/tools/genrb/derb.c.orig Mon Nov 5 18:14:54 2012
|
|
+++ source/tools/genrb/derb.c Thu Dec 6 16:27:22 2012
|
|
@@ -54,7 +54,7 @@ static UConverter *defaultConverter = 0;
|
|
|
|
static const int32_t indentsize = 4;
|
|
static int32_t truncsize = DERB_DEFAULT_TRUNC;
|
|
-static UBool truncate = FALSE;
|
|
+static UBool icu_truncate = FALSE;
|
|
|
|
static const char *getEncodingName(const char *encoding);
|
|
static void reportError(const char *pname, UErrorCode *status, const char *when);
|
|
@@ -152,14 +152,14 @@ main(int argc, char* argv[]) {
|
|
}
|
|
|
|
if(options[4].doesOccur) {
|
|
- truncate = TRUE;
|
|
+ icu_truncate = TRUE;
|
|
if(options[4].value != NULL) {
|
|
truncsize = atoi(options[4].value); /* user defined printable size */
|
|
} else {
|
|
truncsize = DERB_DEFAULT_TRUNC; /* we'll use default omitting size */
|
|
}
|
|
} else {
|
|
- truncate = FALSE;
|
|
+ icu_truncate = FALSE;
|
|
}
|
|
|
|
if(options[5].doesOccur) {
|
|
@@ -473,7 +473,7 @@ static void printOutAlias(FILE *out, UConverter *conv
|
|
int32_t len = 0;
|
|
const UChar* thestr = res_getAlias(&(parent->fResData), r, &len);
|
|
UChar *string = quotedString(thestr);
|
|
- if(truncate && len > truncsize) {
|
|
+ if(icu_truncate && len > truncsize) {
|
|
char msg[128];
|
|
printIndent(out, converter, indent);
|
|
sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
|
|
@@ -517,7 +517,7 @@ static void printOutBundle(FILE *out, UConverter *conv
|
|
UChar *string = quotedString(thestr);
|
|
|
|
/* TODO: String truncation */
|
|
- if(truncate && len > truncsize) {
|
|
+ if(icu_truncate && len > truncsize) {
|
|
char msg[128];
|
|
printIndent(out, converter, indent);
|
|
sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
|
|
@@ -576,7 +576,7 @@ static void printOutBundle(FILE *out, UConverter *conv
|
|
{
|
|
int32_t len = 0;
|
|
const int8_t *data = (const int8_t *)ures_getBinary(resource, &len, status);
|
|
- if(truncate && len > truncsize) {
|
|
+ if(icu_truncate && len > truncsize) {
|
|
char msg[128];
|
|
printIndent(out, converter, indent);
|
|
sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
|