mirror of
https://github.com/postgres/postgres.git
synced 2025-11-13 16:22:44 +03:00
pgindent run on all C files. Java run to follow. initdb/regression
tests pass.
This commit is contained in:
@@ -121,7 +121,6 @@ semctl(int semId, int semNum, int flag, union semun semun)
|
||||
TRACEDBGP("->semctl nmbre %d", Address[0]);
|
||||
for (i = 0; i < Address[0]; i++)
|
||||
{
|
||||
|
||||
/*
|
||||
* Make sure to have ownership of the semaphore (if created by
|
||||
* another team)
|
||||
@@ -294,7 +293,6 @@ semop(int semId, struct sembuf * sops, int nsops)
|
||||
/* For each sem in the pool, check the operation to perform */
|
||||
if (sops[i].sem_op < 0)
|
||||
{
|
||||
|
||||
/*
|
||||
* Try acuiring the semaphore till we are not inteerupted by a
|
||||
* signal
|
||||
|
||||
@@ -48,7 +48,6 @@ shmat(int memId, int m1, int m2)
|
||||
|
||||
if (ainfo.team == teinfo.team)
|
||||
{
|
||||
|
||||
/*
|
||||
* the area is already in our address space, just return the
|
||||
* address
|
||||
@@ -57,7 +56,6 @@ shmat(int memId, int m1, int m2)
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
/*
|
||||
* the area is not in our address space, clone it before and
|
||||
* return the address
|
||||
|
||||
@@ -116,19 +116,17 @@ beos_dl_open(char *filename)
|
||||
}
|
||||
|
||||
void
|
||||
beos_dl_sym(image_id im,char* symname,void** fptr)
|
||||
beos_dl_sym(image_id im, char *symname, void **fptr)
|
||||
{
|
||||
/* Send command '3' (get symbol) to the support server */
|
||||
write_port(beos_dl_port_in, 3, symname, strlen(symname) + 1);
|
||||
write_port(beos_dl_port_in, im, NULL,0);
|
||||
write_port(beos_dl_port_in, im, NULL, 0);
|
||||
|
||||
/* Read sym address */
|
||||
read_port(beos_dl_port_out, (int32*)(fptr), NULL, 0);
|
||||
read_port(beos_dl_port_out, (int32 *) (fptr), NULL, 0);
|
||||
|
||||
if (fptr==NULL)
|
||||
{
|
||||
if (fptr == NULL)
|
||||
elog(NOTICE, "loading symbol '%s' failed ", symname);
|
||||
}
|
||||
}
|
||||
|
||||
status_t
|
||||
@@ -149,7 +147,6 @@ beos_startup(int argc, char **argv)
|
||||
{
|
||||
if (strlen(argv[0]) >= 10 && !strcmp(argv[0] + strlen(argv[0]) - 10, "postmaster"))
|
||||
{
|
||||
|
||||
/*
|
||||
* We are in the postmaster, create the protection semaphore for
|
||||
* shared mem remapping
|
||||
@@ -180,13 +177,13 @@ beos_startup(int argc, char **argv)
|
||||
* server
|
||||
*/
|
||||
read_port(port_in, &opcode, datas, 4000);
|
||||
|
||||
|
||||
switch (opcode)
|
||||
{
|
||||
image_id addon;
|
||||
image_info info_im;
|
||||
area_info info_ar;
|
||||
void * fpt;
|
||||
void *fpt;
|
||||
|
||||
/* Load Add-On */
|
||||
case 1:
|
||||
@@ -226,32 +223,32 @@ beos_startup(int argc, char **argv)
|
||||
break;
|
||||
/* Cleanup and exit */
|
||||
case 3:
|
||||
|
||||
|
||||
/* read image Id on the input port */
|
||||
read_port(port_in, &addon,NULL,0);
|
||||
read_port(port_in, &addon, NULL, 0);
|
||||
|
||||
/* Loading symbol */
|
||||
fpt=NULL;
|
||||
|
||||
|
||||
if (get_image_symbol(addon, datas, B_SYMBOL_TYPE_TEXT, &fpt) == B_OK);
|
||||
{
|
||||
fpt = NULL;
|
||||
|
||||
|
||||
if (get_image_symbol(addon, datas, B_SYMBOL_TYPE_TEXT, &fpt) == B_OK);
|
||||
{
|
||||
/*
|
||||
* Sometime the loader return B_OK for an inexistant function
|
||||
* with an invalid address !!! Check that the return address
|
||||
* is in the image range
|
||||
*/
|
||||
* Sometime the loader return B_OK for an
|
||||
* inexistant function with an invalid address !!!
|
||||
* Check that the return address is in the image
|
||||
* range
|
||||
*/
|
||||
|
||||
get_image_info(addon, &info_im);
|
||||
if ((fpt < info_im.text) ||(fpt >= (info_im.text +info_im.text_size)))
|
||||
fpt=NULL;
|
||||
fpt = NULL;
|
||||
}
|
||||
|
||||
/* Send back fptr of data segment */
|
||||
write_port(port_out, (int32)(fpt),NULL,0);
|
||||
write_port(port_out, (int32) (fpt), NULL, 0);
|
||||
break;
|
||||
|
||||
|
||||
default:
|
||||
/* Free system resources */
|
||||
delete_port(port_in);
|
||||
|
||||
Reference in New Issue
Block a user