Menu
▾
▴
[Firebird-checkins] CVS: interbase/jrd scl.e,1.1.1.1,1.2
|
From: Mike N. <ta...@us...> - 2001-04-11 17:16:22
|
Update of /cvsroot/firebird/interbase/jrd
In directory usw-pr-cvs1:/tmp/cvs-serv4033
Modified Files:
scl.e
Log Message:
compiler warnings
Index: scl.e
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/scl.e,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** scl.e 2000/08/03 20:51:17 1.1.1.1
--- scl.e 2001/04/11 17:16:19 1.2
***************
*** 23,26 ****
--- 23,28 ----
#include <string.h>
+ #include <stdlib.h>
+ #include <ctype.h>
#include "../jrd/ibsetjmp.h"
#include "../jrd/gds.h"
***************
*** 121,125 ****
**************************************/
TDBB tdbb;
! P_NAMES *names;
SCL att_class;
ATT attachment;
--- 123,127 ----
**************************************/
TDBB tdbb;
! CONST P_NAMES *names;
SCL att_class;
ATT attachment;
***************
*** 184,188 ****
JMP_BUF env, *old_env;
-
SET_TDBB (tdbb);
dbb = tdbb->tdbb_database;
--- 186,189 ----
***************
*** 210,214 ****
END_FOR;
! CMP_release (tdbb, request);
/* check if the relation exixts. It may not have been created yet.
--- 211,215 ----
END_FOR;
! CMP_release (tdbb, (REQ)request);
/* check if the relation exixts. It may not have been created yet.
***************
*** 231,235 ****
tdbb->tdbb_setjmp = (UCHAR*) old_env;
if (request)
! CMP_release (tdbb, request);
LONGJMP (tdbb->tdbb_setjmp, (int) tdbb->tdbb_status_vector [1]);
}
--- 232,236 ----
tdbb->tdbb_setjmp = (UCHAR*) old_env;
if (request)
! CMP_release (tdbb, (REQ)request);
LONGJMP (tdbb->tdbb_setjmp, (int) tdbb->tdbb_status_vector [1]);
}
***************
*** 262,266 ****
END_FOR;
! CMP_release (tdbb, request);
tdbb->tdbb_setjmp = (UCHAR*) old_env;
--- 263,267 ----
END_FOR;
! CMP_release (tdbb, (REQ)request);
tdbb->tdbb_setjmp = (UCHAR*) old_env;
***************
*** 430,434 ****
while (*q++ = *p++)
;
! s_class->scl_flags = compute_access (tdbb, s_class, NULL_PTR,
NULL_PTR, NULL_PTR);
--- 431,435 ----
while (*q++ = *p++)
;
! s_class->scl_flags = (USHORT)compute_access (tdbb, s_class, NULL_PTR,
NULL_PTR, NULL_PTR);
***************
*** 440,444 ****
}
! ALL_release (s_class);
return NULL;
--- 441,445 ----
}
! ALL_release ((FRB)s_class);
return NULL;
***************
*** 602,606 ****
REQUEST (irq_get_role_name) = request;
! EXE_unwind (tdbb, request);
ERR_post (isc_login_same_as_role_name,
gds_arg_string, ERR_cstring (login_name), 0);
--- 603,607 ----
REQUEST (irq_get_role_name) = request;
! EXE_unwind (tdbb, (REQ)request);
ERR_post (isc_login_same_as_role_name,
gds_arg_string, ERR_cstring (login_name), 0);
***************
*** 653,657 ****
tdbb->tdbb_attachment->att_security_class = SCL_get_class (X.RDB$SECURITY_CLASS);
END_FOR;
! CMP_release (tdbb, handle);
FOR (REQUEST_HANDLE handle1)
--- 654,658 ----
tdbb->tdbb_attachment->att_security_class = SCL_get_class (X.RDB$SECURITY_CLASS);
END_FOR;
! CMP_release (tdbb, (REQ)handle);
FOR (REQUEST_HANDLE handle1)
***************
*** 666,670 ****
}
END_FOR;
! CMP_release (tdbb, handle1);
}
else
--- 667,671 ----
}
END_FOR;
! CMP_release (tdbb, (REQ)handle1);
}
else
***************
*** 690,694 ****
**************************************/
UCHAR *p;
! P_NAMES *priv;
p = *acl_ptr;
--- 691,695 ----
**************************************/
UCHAR *p;
! CONST P_NAMES *priv;
p = *acl_ptr;
***************
*** 699,705 ****
CHECK_AND_MOVE (p, ACL_priv_list, *start_ptr, length_ptr);
! for (priv = p_names; priv->p_names_priv; priv++)
! if (mask & priv->p_names_priv)
! CHECK_AND_MOVE (p, priv->p_names_acl, *start_ptr, length_ptr);
CHECK_AND_MOVE (p, 0, *start_ptr, length_ptr);
--- 700,709 ----
CHECK_AND_MOVE (p, ACL_priv_list, *start_ptr, length_ptr);
! for (priv = p_names; priv->p_names_priv; priv++) {
! if (mask & priv->p_names_priv) {
! assert(priv->p_names_acl <= MAX_UCHAR);
! CHECK_AND_MOVE (p, (UCHAR)priv->p_names_acl, *start_ptr, length_ptr);
! }
! }
CHECK_AND_MOVE (p, 0, *start_ptr, length_ptr);
***************
*** 730,734 ****
return NULL;
! s_class->scl_flags = compute_access (tdbb, s_class,
NULL_PTR, NULL_PTR, NULL_PTR);
--- 734,738 ----
return NULL;
! s_class->scl_flags = (USHORT)compute_access (tdbb, s_class,
NULL_PTR, NULL_PTR, NULL_PTR);
***************
*** 771,775 ****
}
! ALL_release (s_class);
}
--- 775,779 ----
}
! ALL_release ((FRB)s_class);
}
***************
*** 881,885 ****
tdbb->tdbb_setjmp = (UCHAR*) old_env;
if (buffer)
! ALL_release (buffer);
LONGJMP (tdbb->tdbb_setjmp, (int) tdbb->tdbb_status_vector [1]);
}
--- 885,889 ----
tdbb->tdbb_setjmp = (UCHAR*) old_env;
if (buffer)
! ALL_release ((FRB)buffer);
LONGJMP (tdbb->tdbb_setjmp, (int) tdbb->tdbb_status_vector [1]);
}
***************
*** 911,915 ****
}
! ALL_release (buffer);
tdbb->tdbb_setjmp = (UCHAR*) old_env;
return (n != number);
--- 915,919 ----
}
! ALL_release ((FRB)buffer);
tdbb->tdbb_setjmp = (UCHAR*) old_env;
return (n != number);
***************
*** 997,1001 ****
tdbb->tdbb_setjmp = (UCHAR*) old_env;
if (str_buffer)
! ALL_release (str_buffer);
LONGJMP (tdbb->tdbb_setjmp, (int) tdbb->tdbb_status_vector [1]);
}
--- 1001,1005 ----
tdbb->tdbb_setjmp = (UCHAR*) old_env;
if (str_buffer)
! ALL_release ((FRB)str_buffer);
LONGJMP (tdbb->tdbb_setjmp, (int) tdbb->tdbb_status_vector [1]);
}
***************
*** 1013,1022 ****
REQUEST (irq_l_security) = request;
privileges |= SCL_exists;
! blob = BLB_open (tdbb, dbb->dbb_sys_trans, &X.RDB$ACL);
acl = buffer;
while (TRUE)
{
acl += BLB_get_segment (tdbb, blob, acl,
! (length - ((acl - buffer) * (sizeof(buffer[0])))));
if (blob->blb_flags & BLB_eof)
break;
--- 1017,1026 ----
REQUEST (irq_l_security) = request;
privileges |= SCL_exists;
! blob = BLB_open (tdbb, dbb->dbb_sys_trans, (BID)&X.RDB$ACL);
acl = buffer;
while (TRUE)
{
acl += BLB_get_segment (tdbb, blob, acl,
! (USHORT)(length - ((acl - buffer) * (sizeof(buffer[0])))));
if (blob->blb_flags & BLB_eof)
break;
***************
*** 1026,1030 ****
ULONG old_offset = (ULONG) (acl - buffer);
length += BLOB_BUFFER_SIZE;
! (void) ALL_extend (&str_buffer, length);
buffer = str_buffer->str_data;
acl = buffer + old_offset;
--- 1030,1034 ----
ULONG old_offset = (ULONG) (acl - buffer);
length += BLOB_BUFFER_SIZE;
! (void) ALL_extend ((BLK*)&str_buffer, length);
buffer = str_buffer->str_data;
acl = buffer + old_offset;
***************
*** 1040,1044 ****
! ALL_release (str_buffer);
tdbb->tdbb_setjmp = (UCHAR*) old_env;
--- 1044,1048 ----
! ALL_release ((FRB)str_buffer);
tdbb->tdbb_setjmp = (UCHAR*) old_env;
***************
*** 1100,1104 ****
USHORT hit;
TEXT c, *p, *role_name;
! BOOLEAN is_member = FALSE, equivalent_proc_nm;
VOLATILE BLK request;
DBB dbb;
--- 1104,1108 ----
USHORT hit;
TEXT c, *p, *role_name;
! BOOLEAN is_member = FALSE;
VOLATILE BLK request;
DBB dbb;
|
