summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Schleifer <js@webkeks.org>2011-07-01 01:28:21 +0200
committerJonathan Schleifer <js@webkeks.org>2011-07-01 01:28:21 +0200
commit42231b6d0a7bd9e58b9a8ab1d0377f8c5e419e68 (patch)
tree0c31a95350bb9951f0a17f5ea5c46c61f690d7a7
parent6e6704e856154334976b0a0855a42231c72eadf5 (diff)
Fix wrong variable names resulting from backport.
-rw-r--r--src/OFDictionary.m2
-rw-r--r--src/of_asprintf.m4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/OFDictionary.m b/src/OFDictionary.m
index 442b590b..28b93f9e 100644
--- a/src/OFDictionary.m
+++ b/src/OFDictionary.m
@@ -149,7 +149,7 @@ struct of_dictionary_bucket of_dictionary_deleted_bucket = {};
uint32_t i;
BUCKET *b;
- if (key == nil || object == nil)
+ if (key == nil || obj == nil)
@throw [OFInvalidArgumentException newWithClass: isa
selector: _cmd];
diff --git a/src/of_asprintf.m b/src/of_asprintf.m
index d90afaaf..cace7691 100644
--- a/src/of_asprintf.m
+++ b/src/of_asprintf.m
@@ -238,10 +238,10 @@ state_format_length_modifier(struct context *ctx)
#endif
#ifdef OF_IOS
case 'q': /* iOS uses this for PRI?64 */
- if (!appendSubformat(ctx, ctx->format + ctx->i, 1))
+ if (!append_subfmt(ctx, ctx->fmt + ctx->i, 1))
return false;
- ctx->lengthModifier = LENGTH_MODIFIER_LL;
+ ctx->len_mod = LENGTH_MODIFIER_LL;
break;
#endif