Skip to content

Commit d49fa4c

Browse files
author
Neil Conway
committed
Fix typos in comments and error messages in HStore. Patch from Filip
Rembialkowski, with some additional fixes by myself.
1 parent 5b2def8 commit d49fa4c

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

contrib/hstore/hstore_io.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ get_val(HSParser * state, bool ignoreeq, bool *escaped)
143143
st = GV_INESCVAL;
144144
}
145145
else
146-
elog(ERROR, "Unknown state %d at postion line %d in file '%s'", st, __LINE__, __FILE__);
146+
elog(ERROR, "Unknown state %d at position line %d in file '%s'", st, __LINE__, __FILE__);
147147

148148
state->ptr++;
149149
}
@@ -195,11 +195,11 @@ parse_hstore(HSParser * state)
195195
}
196196
else if (*(state->ptr) == '\0')
197197
{
198-
elog(ERROR, "Unexpectd end of string");
198+
elog(ERROR, "Unexpected end of string");
199199
}
200200
else if (!isspace((unsigned char) *(state->ptr)))
201201
{
202-
elog(ERROR, "Syntax error near '%c' at postion %d", *(state->ptr), (int4) (state->ptr - state->begin));
202+
elog(ERROR, "Syntax error near '%c' at position %d", *(state->ptr), (int4) (state->ptr - state->begin));
203203
}
204204
}
205205
else if (st == WGT)
@@ -210,11 +210,11 @@ parse_hstore(HSParser * state)
210210
}
211211
else if (*(state->ptr) == '\0')
212212
{
213-
elog(ERROR, "Unexpectd end of string");
213+
elog(ERROR, "Unexpected end of string");
214214
}
215215
else
216216
{
217-
elog(ERROR, "Syntax error near '%c' at postion %d", *(state->ptr), (int4) (state->ptr - state->begin));
217+
elog(ERROR, "Syntax error near '%c' at position %d", *(state->ptr), (int4) (state->ptr - state->begin));
218218
}
219219
}
220220
else if (st == WVAL)
@@ -247,7 +247,7 @@ parse_hstore(HSParser * state)
247247
}
248248
else if (!isspace((unsigned char) *(state->ptr)))
249249
{
250-
elog(ERROR, "Syntax error near '%c' at postion %d", *(state->ptr), (int4) (state->ptr - state->begin));
250+
elog(ERROR, "Syntax error near '%c' at position %d", *(state->ptr), (int4) (state->ptr - state->begin));
251251
}
252252
}
253253
else
@@ -271,7 +271,7 @@ comparePairs(const void *a, const void *b)
271271
if (res)
272272
return res;
273273

274-
/* guarantee that neddfree willl be later */
274+
/* guarantee that needfree will be later */
275275
if (((Pairs *) b)->needfree == ((Pairs *) a)->needfree)
276276
return 0;
277277
else if (((Pairs *) a)->needfree)

contrib/hstore/hstore_op.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ delete(PG_FUNCTION_ARGS)
112112
*ed;
113113

114114
out->len = hs->len;
115-
out->size = hs->size; /* temprorary! */
115+
out->size = hs->size; /* temporary! */
116116

117117
ptrs = STRPTR(hs);
118118
es = ARRPTR(hs);

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy