mirror of
https://github.com/postgres/postgres.git
synced 2025-07-28 23:42:10 +03:00
pgindent run over code.
This commit is contained in:
Bruce Momjian
@ -44,21 +44,22 @@ int8in(char *str)
|
||||
if (!PointerIsValid(str))
|
||||
elog(ERROR, "Bad (null) int8 external representation", NULL);
|
||||
|
||||
/* Do our own scan, rather than relying on sscanf which might be
|
||||
/*
|
||||
* Do our own scan, rather than relying on sscanf which might be
|
||||
* broken for long long. NOTE: this will not detect int64 overflow...
|
||||
* but sscanf doesn't either...
|
||||
*/
|
||||
while (*ptr && isspace(*ptr)) /* skip leading spaces */
|
||||
while (*ptr && isspace(*ptr)) /* skip leading spaces */
|
||||
ptr++;
|
||||
if (*ptr == '-') /* handle sign */
|
||||
if (*ptr == '-') /* handle sign */
|
||||
sign = -1, ptr++;
|
||||
else if (*ptr == '+')
|
||||
ptr++;
|
||||
if (! isdigit(*ptr)) /* require at least one digit */
|
||||
if (!isdigit(*ptr)) /* require at least one digit */
|
||||
elog(ERROR, "Bad int8 external representation '%s'", str);
|
||||
while (*ptr && isdigit(*ptr)) /* process digits */
|
||||
while (*ptr && isdigit(*ptr)) /* process digits */
|
||||
tmp = tmp * 10 + (*ptr++ - '0');
|
||||
if (*ptr) /* trailing junk? */
|
||||
if (*ptr) /* trailing junk? */
|
||||
elog(ERROR, "Bad int8 external representation '%s'", str);
|
||||
|
||||
*result = (sign < 0) ? -tmp : tmp;
|
||||
@ -70,7 +71,7 @@ int8in(char *str)
|
||||
/* int8out()
|
||||
*/
|
||||
char *
|
||||
int8out(int64 *val)
|
||||
int8out(int64 * val)
|
||||
{
|
||||
char *result;
|
||||
|
||||
@ -99,37 +100,37 @@ int8out(int64 *val)
|
||||
* Is val1 relop val2?
|
||||
*/
|
||||
bool
|
||||
int8eq(int64 *val1, int64 *val2)
|
||||
int8eq(int64 * val1, int64 * val2)
|
||||
{
|
||||
return *val1 == *val2;
|
||||
} /* int8eq() */
|
||||
|
||||
bool
|
||||
int8ne(int64 *val1, int64 *val2)
|
||||
int8ne(int64 * val1, int64 * val2)
|
||||
{
|
||||
return *val1 != *val2;
|
||||
} /* int8ne() */
|
||||
|
||||
bool
|
||||
int8lt(int64 *val1, int64 *val2)
|
||||
int8lt(int64 * val1, int64 * val2)
|
||||
{
|
||||
return *val1 < *val2;
|
||||
} /* int8lt() */
|
||||
|
||||
bool
|
||||
int8gt(int64 *val1, int64 *val2)
|
||||
int8gt(int64 * val1, int64 * val2)
|
||||
{
|
||||
return *val1 > *val2;
|
||||
} /* int8gt() */
|
||||
|
||||
bool
|
||||
int8le(int64 *val1, int64 *val2)
|
||||
int8le(int64 * val1, int64 * val2)
|
||||
{
|
||||
return *val1 <= *val2;
|
||||
} /* int8le() */
|
||||
|
||||
bool
|
||||
int8ge(int64 *val1, int64 *val2)
|
||||
int8ge(int64 * val1, int64 * val2)
|
||||
{
|
||||
return *val1 >= *val2;
|
||||
} /* int8ge() */
|
||||
@ -139,37 +140,37 @@ int8ge(int64 *val1, int64 *val2)
|
||||
* Is 64-bit val1 relop 32-bit val2?
|
||||
*/
|
||||
bool
|
||||
int84eq(int64 *val1, int32 val2)
|
||||
int84eq(int64 * val1, int32 val2)
|
||||
{
|
||||
return *val1 == val2;
|
||||
} /* int84eq() */
|
||||
|
||||
bool
|
||||
int84ne(int64 *val1, int32 val2)
|
||||
int84ne(int64 * val1, int32 val2)
|
||||
{
|
||||
return *val1 != val2;
|
||||
} /* int84ne() */
|
||||
|
||||
bool
|
||||
int84lt(int64 *val1, int32 val2)
|
||||
int84lt(int64 * val1, int32 val2)
|
||||
{
|
||||
return *val1 < val2;
|
||||
} /* int84lt() */
|
||||
|
||||
bool
|
||||
int84gt(int64 *val1, int32 val2)
|
||||
int84gt(int64 * val1, int32 val2)
|
||||
{
|
||||
return *val1 > val2;
|
||||
} /* int84gt() */
|
||||
|
||||
bool
|
||||
int84le(int64 *val1, int32 val2)
|
||||
int84le(int64 * val1, int32 val2)
|
||||
{
|
||||
return *val1 <= val2;
|
||||
} /* int84le() */
|
||||
|
||||
bool
|
||||
int84ge(int64 *val1, int32 val2)
|
||||
int84ge(int64 * val1, int32 val2)
|
||||
{
|
||||
return *val1 >= val2;
|
||||
} /* int84ge() */
|
||||
@ -179,37 +180,37 @@ int84ge(int64 *val1, int32 val2)
|
||||
* Is 32-bit val1 relop 64-bit val2?
|
||||
*/
|
||||
bool
|
||||
int48eq(int32 val1, int64 *val2)
|
||||
int48eq(int32 val1, int64 * val2)
|
||||
{
|
||||
return val1 == *val2;
|
||||
} /* int48eq() */
|
||||
|
||||
bool
|
||||
int48ne(int32 val1, int64 *val2)
|
||||
int48ne(int32 val1, int64 * val2)
|
||||
{
|
||||
return val1 != *val2;
|
||||
} /* int48ne() */
|
||||
|
||||
bool
|
||||
int48lt(int32 val1, int64 *val2)
|
||||
int48lt(int32 val1, int64 * val2)
|
||||
{
|
||||
return val1 < *val2;
|
||||
} /* int48lt() */
|
||||
|
||||
bool
|
||||
int48gt(int32 val1, int64 *val2)
|
||||
int48gt(int32 val1, int64 * val2)
|
||||
{
|
||||
return val1 > *val2;
|
||||
} /* int48gt() */
|
||||
|
||||
bool
|
||||
int48le(int32 val1, int64 *val2)
|
||||
int48le(int32 val1, int64 * val2)
|
||||
{
|
||||
return val1 <= *val2;
|
||||
} /* int48le() */
|
||||
|
||||
bool
|
||||
int48ge(int32 val1, int64 *val2)
|
||||
int48ge(int32 val1, int64 * val2)
|
||||
{
|
||||
return val1 >= *val2;
|
||||
} /* int48ge() */
|
||||
@ -220,7 +221,7 @@ int48ge(int32 val1, int64 *val2)
|
||||
*---------------------------------------------------------*/
|
||||
|
||||
int64 *
|
||||
int8um(int64 *val)
|
||||
int8um(int64 * val)
|
||||
{
|
||||
int64 temp = 0;
|
||||
int64 *result = palloc(sizeof(int64));
|
||||
@ -235,7 +236,7 @@ int8um(int64 *val)
|
||||
|
||||
|
||||
int64 *
|
||||
int8pl(int64 *val1, int64 *val2)
|
||||
int8pl(int64 * val1, int64 * val2)
|
||||
{
|
||||
int64 *result = palloc(sizeof(int64));
|
||||
|
||||
@ -248,7 +249,7 @@ int8pl(int64 *val1, int64 *val2)
|
||||
} /* int8pl() */
|
||||
|
||||
int64 *
|
||||
int8mi(int64 *val1, int64 *val2)
|
||||
int8mi(int64 * val1, int64 * val2)
|
||||
{
|
||||
int64 *result = palloc(sizeof(int64));
|
||||
|
||||
@ -261,7 +262,7 @@ int8mi(int64 *val1, int64 *val2)
|
||||
} /* int8mi() */
|
||||
|
||||
int64 *
|
||||
int8mul(int64 *val1, int64 *val2)
|
||||
int8mul(int64 * val1, int64 * val2)
|
||||
{
|
||||
int64 *result = palloc(sizeof(int64));
|
||||
|
||||
@ -274,7 +275,7 @@ int8mul(int64 *val1, int64 *val2)
|
||||
} /* int8mul() */
|
||||
|
||||
int64 *
|
||||
int8div(int64 *val1, int64 *val2)
|
||||
int8div(int64 * val1, int64 * val2)
|
||||
{
|
||||
int64 *result = palloc(sizeof(int64));
|
||||
|
||||
@ -287,7 +288,7 @@ int8div(int64 *val1, int64 *val2)
|
||||
} /* int8div() */
|
||||
|
||||
int64 *
|
||||
int8larger(int64 *val1, int64 *val2)
|
||||
int8larger(int64 * val1, int64 * val2)
|
||||
{
|
||||
int64 *result = palloc(sizeof(int64));
|
||||
|
||||
@ -300,7 +301,7 @@ int8larger(int64 *val1, int64 *val2)
|
||||
} /* int8larger() */
|
||||
|
||||
int64 *
|
||||
int8smaller(int64 *val1, int64 *val2)
|
||||
int8smaller(int64 * val1, int64 * val2)
|
||||
{
|
||||
int64 *result = palloc(sizeof(int64));
|
||||
|
||||
@ -314,7 +315,7 @@ int8smaller(int64 *val1, int64 *val2)
|
||||
|
||||
|
||||
int64 *
|
||||
int84pl(int64 *val1, int32 val2)
|
||||
int84pl(int64 * val1, int32 val2)
|
||||
{
|
||||
int64 *result = palloc(sizeof(int64));
|
||||
|
||||
@ -327,7 +328,7 @@ int84pl(int64 *val1, int32 val2)
|
||||
} /* int84pl() */
|
||||
|
||||
int64 *
|
||||
int84mi(int64 *val1, int32 val2)
|
||||
int84mi(int64 * val1, int32 val2)
|
||||
{
|
||||
int64 *result = palloc(sizeof(int64));
|
||||
|
||||
@ -340,7 +341,7 @@ int84mi(int64 *val1, int32 val2)
|
||||
} /* int84mi() */
|
||||
|
||||
int64 *
|
||||
int84mul(int64 *val1, int32 val2)
|
||||
int84mul(int64 * val1, int32 val2)
|
||||
{
|
||||
int64 *result = palloc(sizeof(int64));
|
||||
|
||||
@ -353,7 +354,7 @@ int84mul(int64 *val1, int32 val2)
|
||||
} /* int84mul() */
|
||||
|
||||
int64 *
|
||||
int84div(int64 *val1, int32 val2)
|
||||
int84div(int64 * val1, int32 val2)
|
||||
{
|
||||
int64 *result = palloc(sizeof(int64));
|
||||
|
||||
@ -367,7 +368,7 @@ int84div(int64 *val1, int32 val2)
|
||||
|
||||
|
||||
int64 *
|
||||
int48pl(int32 val1, int64 *val2)
|
||||
int48pl(int32 val1, int64 * val2)
|
||||
{
|
||||
int64 *result = palloc(sizeof(int64));
|
||||
|
||||
@ -380,7 +381,7 @@ int48pl(int32 val1, int64 *val2)
|
||||
} /* int48pl() */
|
||||
|
||||
int64 *
|
||||
int48mi(int32 val1, int64 *val2)
|
||||
int48mi(int32 val1, int64 * val2)
|
||||
{
|
||||
int64 *result = palloc(sizeof(int64));
|
||||
|
||||
@ -393,7 +394,7 @@ int48mi(int32 val1, int64 *val2)
|
||||
} /* int48mi() */
|
||||
|
||||
int64 *
|
||||
int48mul(int32 val1, int64 *val2)
|
||||
int48mul(int32 val1, int64 * val2)
|
||||
{
|
||||
int64 *result = palloc(sizeof(int64));
|
||||
|
||||
@ -406,7 +407,7 @@ int48mul(int32 val1, int64 *val2)
|
||||
} /* int48mul() */
|
||||
|
||||
int64 *
|
||||
int48div(int32 val1, int64 *val2)
|
||||
int48div(int32 val1, int64 * val2)
|
||||
{
|
||||
int64 *result = palloc(sizeof(int64));
|
||||
|
||||
@ -434,7 +435,7 @@ int48(int32 val)
|
||||
} /* int48() */
|
||||
|
||||
int32
|
||||
int84(int64 *val)
|
||||
int84(int64 * val)
|
||||
{
|
||||
int32 result;
|
||||
|
||||
@ -442,6 +443,7 @@ int84(int64 *val)
|
||||
elog(ERROR, "Invalid (null) int64, can't convert int8 to int4", NULL);
|
||||
|
||||
#if NOT_USED
|
||||
|
||||
/*
|
||||
* Hmm. This conditional always tests true on my i686/linux box. It's
|
||||
* a gcc compiler bug, or I'm missing something obvious, which is more
|
||||
@ -449,8 +451,8 @@ int84(int64 *val)
|
||||
*/
|
||||
if ((*val < INT_MIN) || (*val > INT_MAX))
|
||||
#endif
|
||||
if ((*val < (-pow(2, 31) + 1)) || (*val > (pow(2, 31) - 1)))
|
||||
elog(ERROR, "int8 conversion to int4 is out of range", NULL);
|
||||
if ((*val < (-pow(2, 31) + 1)) || (*val > (pow(2, 31) - 1)))
|
||||
elog(ERROR, "int8 conversion to int4 is out of range", NULL);
|
||||
|
||||
result = *val;
|
||||
|
||||
@ -471,7 +473,7 @@ int28 (int16 val)
|
||||
} /* int28() */
|
||||
|
||||
int16
|
||||
int82(int64 *val)
|
||||
int82(int64 * val)
|
||||
{
|
||||
int16 result;
|
||||
|
||||
@ -489,7 +491,7 @@ int82(int64 *val)
|
||||
#endif
|
||||
|
||||
float64
|
||||
i8tod(int64 *val)
|
||||
i8tod(int64 * val)
|
||||
{
|
||||
float64 result = palloc(sizeof(float64data));
|
||||
|
||||
@ -533,9 +535,9 @@ text_int8(text *str)
|
||||
elog(ERROR, "Bad (null) int8 external representation", NULL);
|
||||
|
||||
len = (VARSIZE(str) - VARHDRSZ);
|
||||
s = palloc(len+1);
|
||||
s = palloc(len + 1);
|
||||
memmove(s, VARDATA(str), len);
|
||||
*(s+len) = '\0';
|
||||
*(s + len) = '\0';
|
||||
|
||||
return int8in(s);
|
||||
} /* text_int8() */
|
||||
@ -544,7 +546,7 @@ text_int8(text *str)
|
||||
/* int8_text()
|
||||
*/
|
||||
text *
|
||||
int8_text(int64 *val)
|
||||
int8_text(int64 * val)
|
||||
{
|
||||
text *result;
|
||||
|
||||
@ -564,4 +566,3 @@ int8_text(int64 *val)
|
||||
|
||||
return result;
|
||||
} /* int8out() */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user