+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997-2004 The PHP Group |
+ | Copyright (c) 1997-2011 The PHP Group |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, |
+ | This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_0.txt. |
+ | http://www.php.net/license/3_01.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
#define MAX_ASSOC 200
-#define GET_PARM1(a) zend_parse_parameters(1 , "z", a)
-#define GET_PARM2(a,b) zend_parse_parameters(2, "zz", a, b)
-#define GET_PARM3(a,b,c) zend_parse_parameters(3, "zzz", a, b, c)
-#define GET_PARM4(a,b,c,d) zend_parse_parameters(4, "zzzz", a, b, c, d)
+#define GET_PARM1(a) zend_parse_parameters(1 TSRMLS_CC , "z", a)
+#define GET_PARM2(a,b) zend_parse_parameters(2 TSRMLS_CC, "zz", a, b)
+#define GET_PARM3(a,b,c) zend_parse_parameters(3 TSRMLS_CC, "zzz", a, b, c)
+#define GET_PARM4(a,b,c,d) zend_parse_parameters(4 TSRMLS_CC, "zzzz", a, b, c, d)
typedef struct Yaz_AssociationInfo *Yaz_Association;
static Yaz_Association yaz_association_mk()
{
- Yaz_Association p = xmalloc (sizeof(*p));
+ Yaz_Association p = xmalloc(sizeof(*p));
- p->zoom_conn = ZOOM_connection_create (0);
+ p->zoom_conn = ZOOM_connection_create(0);
p->zoom_set = 0;
p->zoom_scan = 0;
p->zoom_package = 0;
return p;
}
-static void yaz_association_destroy (Yaz_Association p)
+static void yaz_association_destroy(Yaz_Association p)
{
if (!p) {
return;
*assocp = 0;
#ifdef ZTS
- tsrm_mutex_lock (yaz_mutex);
+ tsrm_mutex_lock(yaz_mutex);
#endif
ZEND_FETCH_RESOURCE(as, Yaz_Association *, &id, -1, "YAZ link", le_link);
*assocp = *as;
} else {
#ifdef ZTS
- tsrm_mutex_unlock (yaz_mutex);
+ tsrm_mutex_unlock(yaz_mutex);
#endif
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid YAZ handle");
}
if (as) {
char s[30];
- sprintf (s, "%d", v);
+ sprintf(s, "%d", v);
ZOOM_connection_option_set(as->zoom_conn, name, s);
}
}
if (i == -1) {
char msg[80];
#ifdef ZTS
- tsrm_mutex_unlock (yaz_mutex);
+ tsrm_mutex_unlock(yaz_mutex);
#endif
sprintf(msg, "No YAZ handles available. max_links=%d",
max_links);
yaz_association_destroy(shared_associations[i]);
}
}
- shared_associations[i] = as = yaz_association_mk ();
+ shared_associations[i] = as = yaz_association_mk();
option_set(as, "proxy", proxy_str);
option_set(as, "sru", sru_str);
as->zoom_set = 0;
}
#ifdef ZTS
- tsrm_mutex_unlock (yaz_mutex);
+ tsrm_mutex_unlock(yaz_mutex);
#endif
ZEND_REGISTER_RESOURCE(return_value, &shared_associations[i], le_link);
if (p->sort_criteria) {
ZOOM_query_sortby(q, p->sort_criteria);
}
- xfree (p->sort_criteria);
+ xfree(p->sort_criteria);
p->sort_criteria = 0;
p->zoom_set = ZOOM_connection_search(p->zoom_conn, q);
RETVAL_TRUE;
if (ZEND_NUM_ARGS() != 1) {
WRONG_PARAM_COUNT;
}
- if (GET_PARM1(id) == FAILURE) {
+ if (GET_PARM1(&id) == FAILURE) {
WRONG_PARAM_COUNT;
}
}
if (no) {
- while (ZOOM_event (no, conn_ar))
+ while (ZOOM_event(no, conn_ar))
;
}
RETURN_TRUE;
int length_starting;
int length_implementation;
int max_elements = 256;
- Z_GenericRecord *r = odr_malloc (o, sizeof(*r));
- r->elements = odr_malloc (o, sizeof(*r->elements) * max_elements);
+ Z_GenericRecord *r = odr_malloc(o, sizeof(*r));
+ r->elements = odr_malloc(o, sizeof(*r->elements) * max_elements);
r->num_elements = 0;
record_length = atoi_n(buf, 5);
tag->tagOccurrence = 0;
tag->metaData = 0;
tag->appliedVariant = 0;
- tag->tagValue = odr_malloc (o, sizeof(*tag->tagValue));
+ tag->tagValue = odr_malloc(o, sizeof(*tag->tagValue));
tag->tagValue->which = Z_StringOrNumeric_string;
tag->tagValue->u.string = odr_strdup(o, "leader");
tag->tagOccurrence = 0;
tag->metaData = 0;
tag->appliedVariant = 0;
- tag->tagValue = odr_malloc (o, sizeof(*tag->tagValue));
+ tag->tagValue = odr_malloc(o, sizeof(*tag->tagValue));
tag->tagValue->which = Z_StringOrNumeric_string;
tag->tagValue->u.string = odr_strdup(o, tag_str);
if (buf[i + indicator_length] != ISO2709_IDFS) {
identifier_flag = 0;
}
- } else if (!memcmp (tag_str, "00", 2)) {
+ } else if (!memcmp(tag_str, "00", 2)) {
identifier_flag = 0;
}
int i0;
/* prepare tag */
Z_TaggedElement *parent_tag = tag;
- Z_TaggedElement *tag = odr_malloc (o, sizeof(*tag));
+ Z_TaggedElement *tag = odr_malloc(o, sizeof(*tag));
if (parent_tag->content->u.subtree->num_elements < 256) {
parent_tag->content->u.subtree->elements[
tag->tagOccurrence = 0;
tag->metaData = 0;
tag->appliedVariant = 0;
- tag->tagValue = odr_malloc (o, sizeof(*tag->tagValue));
+ tag->tagValue = odr_malloc(o, sizeof(*tag->tagValue));
tag->tagValue->which = Z_StringOrNumeric_string;
/* sub field */
array_init(zval_element);
if (e->tagType)
- add_assoc_long(zval_element, "tagType", *e->tagType);
+ add_assoc_long(zval_element, "tagType", (long) *e->tagType);
if (e->tagValue->which == Z_StringOrNumeric_string)
add_assoc_string(zval_element, "tag", e->tagValue->u.string, 1);
else if (e->tagValue->which == Z_StringOrNumeric_numeric)
- add_assoc_long(zval_element, "tag", *e->tagValue->u.numeric);
+ add_assoc_long(zval_element, "tag", (long) *e->tagValue->u.numeric);
switch (e->content->which) {
case Z_ElementData_string:
}
break;
case Z_ElementData_numeric:
- add_assoc_long(zval_element, "content",*e->content->u.numeric);
+ add_assoc_long(zval_element, "content", (long) *e->content->u.numeric);
break;
case Z_ElementData_trueOrFalse:
add_assoc_bool(zval_element, "content",*e->content->u.trueOrFalse);
}
*tag = '\0';
for (i = 0; i <= level; i++) {
- int tag_type = 3;
+ long tag_type = 3;
e = grs[i]->elements[eno[i]];
if (e->tagType) {
- tag_type = *e->tagType;
+ tag_type = (long) *e->tagType;
}
taglen = strlen(tag);
- sprintf(tag + taglen, "(%d,", tag_type);
+ sprintf(tag + taglen, "(%ld,", tag_type);
taglen = strlen(tag);
if (e->tagValue->which == Z_StringOrNumeric_string) {
}
break;
case Z_ElementData_numeric:
- add_next_index_long(my_zval, *e->content->u.numeric);
+ add_next_index_long(my_zval, (long) *e->content->u.numeric);
break;
case Z_ElementData_trueOrFalse:
add_next_index_long(my_zval, *e->content->u.trueOrFalse);
}
}
}
- release_assoc (p);
+ release_assoc(p);
}
/* }}} */
}
option_set(p, key, (*ent)->value.str.val);
}
- release_assoc (p);
+ release_assoc(p);
}
} else if (ZEND_NUM_ARGS() == 3) {
if (GET_PARM3( &pval_id, &pval_name, &pval_val) == FAILURE) {
}
/* }}} */
-const char *ill_array_lookup (void *handle, const char *name)
+const char *ill_array_lookup(void *handle, const char *name)
{
return array_lookup_string((HashTable *) handle, name);
}
p->zoom_package = ZOOM_connection_package(p->zoom_conn, options);
ZOOM_package_send(p->zoom_package, "itemorder");
ZOOM_options_set_callback(options, 0, 0);
- ZOOM_options_destroy (options);
+ ZOOM_options_destroy(options);
}
release_assoc(p);
}
p->zoom_package = ZOOM_connection_package(p->zoom_conn, options);
ZOOM_package_send(p->zoom_package, pval_type->value.str.val);
ZOOM_options_set_callback(options, 0, 0);
- ZOOM_options_destroy (options);
+ ZOOM_options_destroy(options);
}
release_assoc(p);
}
ccl_qual_fitem(p->bibset, (*ent)->value.str.val, key);
}
}
- release_assoc (p);
+ release_assoc(p);
}
/* }}} */
}
}
-static void yaz_close_link (zend_rsrc_list_entry *rsrc TSRMLS_DC)
+static void yaz_close_link(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
Yaz_Association *as = (Yaz_Association *) rsrc->ptr;
yaz_close_session(as TSRMLS_CC);
else
yaz_log_init_level(0);
- le_link = zend_register_list_destructors_ex (yaz_close_link, 0, "YAZ link", module_number);
+ le_link = zend_register_list_destructors_ex(yaz_close_link, 0, "YAZ link", module_number);
order_associations = 1;
shared_associations = xmalloc(sizeof(*shared_associations) * MAX_ASSOC);
shared_associations = 0;
}
#ifdef ZTS
- tsrm_mutex_free (yaz_mutex);
+ tsrm_mutex_free(yaz_mutex);
#endif
yaz_log_init_file(0);
projects / phpyaz-moved-to-github.git / blobdiff