Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 53824 Details for
Bug 85829
linesrv-2.1.20 use of "list_add" function conflict with mysql-4.1.10a
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
linesrv-mysql-4.1.patch
linesrv-mysql-4.1.patch (text/plain), 6.66 KB, created by
Francesco R. (RETIRED)
on 2005-03-18 15:44:05 UTC
(
hide
)
Description:
linesrv-mysql-4.1.patch
Filename:
MIME Type:
Creator:
Francesco R. (RETIRED)
Created:
2005-03-18 15:44:05 UTC
Size:
6.66 KB
patch
obsolete
>--- old/lclog/lclog.c 2005-03-19 00:37:32.472176728 +0100 >+++ linesrv-2.1/lclog/lclog.c 2005-03-19 00:39:35.040543504 +0100 >@@ -226,7 +226,7 @@ > { // handle a user entry > if ( !(name = get_name(&lstname, newname)) ) > { >- name = (struct t_name*)list_add(&lstname, sizeof(struct t_name)); >+ name = (struct t_name*)ll_list_add(&lstname, sizeof(struct t_name)); > strcpy(name->name, newname); > name->secs = newsecs; > if ( havecosts ) >@@ -248,7 +248,7 @@ > { // handle a line/manually entry > if ( !(name = get_name(&lstline, newname)) ) > { >- name = (struct t_name*)list_add(&lstline, sizeof(struct t_name)); >+ name = (struct t_name*)ll_list_add(&lstline, sizeof(struct t_name)); > strcpy(name->name, newname); > > name->secs = 0; >--- old/lclog/lists.c 2005-03-19 00:37:32.476176120 +0100 >+++ linesrv-2.1/lclog/lists.c 2005-03-19 00:39:40.770672392 +0100 >@@ -17,7 +17,7 @@ > list->count = 0; > } > >-struct list_hdr_t *list_add(struct list_anchor_t *list, int size) >+struct list_hdr_t *ll_list_add(struct list_anchor_t *list, int size) > /* appends an item to the end of the list */ > { > struct list_hdr_t *item; >--- old/lclog/lists.h 2005-03-19 00:37:32.484174904 +0100 >+++ linesrv-2.1/lclog/lists.h 2005-03-19 00:39:46.670775440 +0100 >@@ -14,7 +14,7 @@ > }; > > void list_init(struct list_anchor_t *list); >-struct list_hdr_t *list_add(struct list_anchor_t *list, int size); >+struct list_hdr_t *ll_list_add(struct list_anchor_t *list, int size); > void list_del(struct list_anchor_t *list, struct list_hdr_t *item); > void list_flush(struct list_anchor_t *list); > int list_count(struct list_anchor_t *list); >--- old/server/cfg.c 2005-03-19 00:37:32.493173536 +0100 >+++ linesrv-2.1/server/cfg.c 2005-03-19 00:48:51.361969792 +0100 >@@ -390,7 +390,7 @@ > config_set_conf_addrs(); > config_load_defaults(); > /* create & init default line, id 0 */ >- curline = (struct line_t*)list_add(&lstlines, sizeof(struct line_t)); >+ curline = (struct line_t*)ll_list_add(&lstlines, sizeof(struct line_t)); > if ( !curline ) > { > fprintf(stderr, "Not enough memory to load configuration.\n"); >@@ -425,7 +425,7 @@ > case LCS_CONF_LINE: > // integrity of current line gets checked at the end. > // let's begin with the settings of a new line >- curline = (struct line_t*)list_add(&lstlines, sizeof(struct line_t)); >+ curline = (struct line_t*)ll_list_add(&lstlines, sizeof(struct line_t)); > if ( !curline ) > { > fprintf(stderr, "Not enough memory to load configuration.\n"); >@@ -599,7 +599,7 @@ > // ok, got new filter entry > if (server->ipl_type != IPL_INVALID) > { >- iplentry = (struct ipl_item_t*)list_add(&ipl, sizeof(struct ipl_item_t)); >+ iplentry = (struct ipl_item_t*)ll_list_add(&ipl, sizeof(struct ipl_item_t)); > if ( !iplentry ) > { > server->ipl_type = IPL_INVALID; >@@ -632,7 +632,7 @@ > // ok, got new shutdown - filter entry > if (server->shtdn_ipl_type != IPL_INVALID) > { >- iplentry = (struct ipl_item_t*)list_add(&shtdn_ipl, sizeof(struct ipl_item_t)); >+ iplentry = (struct ipl_item_t*)ll_list_add(&shtdn_ipl, sizeof(struct ipl_item_t)); > if ( !iplentry ) > { > server->shtdn_ipl_type = IPL_INVALID; >--- old/server/cmd.c 2005-03-19 00:37:32.502172168 +0100 >+++ linesrv-2.1/server/cmd.c 2005-03-19 00:40:07.281642112 +0100 >@@ -55,7 +55,7 @@ > struct ordq_item_t *item; > int efflen = LC_MAX_MSG_LEN; > if ( msglen < efflen ) efflen = msglen; >- if ( (item = (struct ordq_item_t*)list_add(&ordq, sizeof(struct ordq_item_t))) == NULL ) >+ if ( (item = (struct ordq_item_t*)ll_list_add(&ordq, sizeof(struct ordq_item_t))) == NULL ) > { > syslog(LOG_WARNING, "cmd_q(): malloc(%d) returned NULL", sizeof(struct ordq_item_t)); > return(-2); >@@ -286,7 +286,7 @@ > struct ackq_item_t *item; > if ( which->cmd >= CBR_INFO ) return(0); // we shouldn't get acks for cmds > // >= CBR_INFO, so block here. >- if ( (item = (struct ackq_item_t*)list_add(&ackq, sizeof(struct ackq_item_t))) == NULL ) >+ if ( (item = (struct ackq_item_t*)ll_list_add(&ackq, sizeof(struct ackq_item_t))) == NULL ) > { > syslog(LOG_WARNING, "ack_q(): malloc(%d) returned NULL", sizeof(struct ackq_item_t)); > return(-2); >--- old/server/lists.c 2005-03-19 00:37:32.512170648 +0100 >+++ linesrv-2.1/server/lists.c 2005-03-19 00:40:14.375563672 +0100 >@@ -17,7 +17,7 @@ > list->count = 0; > } > >-struct list_hdr_t *list_add(struct list_anchor_t *list, int size) >+struct list_hdr_t *ll_list_add(struct list_anchor_t *list, int size) > /* appends an item to the end of the list */ > { > struct list_hdr_t *item; >--- old/server/lists.h 2005-03-19 00:37:32.521169280 +0100 >+++ linesrv-2.1/server/lists.h 2005-03-19 00:40:27.062634944 +0100 >@@ -14,7 +14,7 @@ > }; > > void list_init(struct list_anchor_t *list); >-struct list_hdr_t *list_add(struct list_anchor_t *list, int size); >+struct list_hdr_t *ll_list_add(struct list_anchor_t *list, int size); > void list_del(struct list_anchor_t *list, struct list_hdr_t *item); > void list_flush(struct list_anchor_t *list); > int list_count(struct list_anchor_t *list); >--- old/server/cmd_lcp3.c 2005-03-19 00:37:32.530167912 +0100 >+++ linesrv-2.1/server/cmd_lcp3.c 2005-03-19 00:40:40.088654688 +0100 >@@ -22,7 +22,7 @@ > int lcp3_cmd_queue(int cmd, struct client_t *who, void* info, int infosize) > { > struct t_lcp3_ordq_item* newcmd; >- if ( !(newcmd = (struct t_lcp3_ordq_item*)list_add(&lcp3_ordq, sizeof(struct t_lcp3_ordq_item))) ) >+ if ( !(newcmd = (struct t_lcp3_ordq_item*)ll_list_add(&lcp3_ordq, sizeof(struct t_lcp3_ordq_item))) ) > { > syslog(LOG_ERR, "Out of memory. Unable to queue command."); > return(-1); >--- old/server/proc.c 2005-03-19 00:37:32.539166544 +0100 >+++ linesrv-2.1/server/proc.c 2005-03-19 00:40:47.154580504 +0100 >@@ -92,7 +92,7 @@ > return(1); > } > // create a new client - record, type DC >- if ( (who = (struct client_t*)list_add(&cltlist, sizeof(struct client_t))) == NULL ) >+ if ( (who = (struct client_t*)ll_list_add(&cltlist, sizeof(struct client_t))) == NULL ) > { > syslog(LOG_WARNING, "%s:%d registering error!", inet_ntoa(from->sin_addr), ntohs(from->sin_port)); > cmd_direct(CMD_REG_ERROR, sock, from, NULL, 0, type); >--- old/server/netinput.c 2005-03-19 00:37:32.548165176 +0100 >+++ linesrv-2.1/server/netinput.c 2005-03-19 00:41:00.007626544 +0100 >@@ -77,7 +77,7 @@ > struct client_t *who; > newsock = accept(server->tcp_socket, (struct sockaddr*)from, &len); > if ( newsock == -1 ) return(-1); >- who = (struct client_t*)list_add(&cltlist, sizeof(struct client_t)); >+ who = (struct client_t*)ll_list_add(&cltlist, sizeof(struct client_t)); > if ( !who ) > { > syslog(LOG_ERR, "can't add new client, not enough memory");
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=53824">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 85829
: 53824
