summaryrefslogtreecommitdiffstats
path: root/openembedded/packages/ipkg/ipkg-0.99.140/remove-c99isms.patch
diff options
context:
space:
mode:
Diffstat (limited to 'openembedded/packages/ipkg/ipkg-0.99.140/remove-c99isms.patch')
-rw-r--r--openembedded/packages/ipkg/ipkg-0.99.140/remove-c99isms.patch124
1 files changed, 0 insertions, 124 deletions
diff --git a/openembedded/packages/ipkg/ipkg-0.99.140/remove-c99isms.patch b/openembedded/packages/ipkg/ipkg-0.99.140/remove-c99isms.patch
deleted file mode 100644
index f1ad2a3f6c..0000000000
--- a/openembedded/packages/ipkg/ipkg-0.99.140/remove-c99isms.patch
+++ /dev/null
@@ -1,124 +0,0 @@
1Index: C/pkg_depends.c
2===================================================================
3--- C.orig/pkg_depends.c 2005-02-08 14:32:46.000000000 +0000
4+++ C/pkg_depends.c 2005-02-08 15:50:50.000000000 +0000
5@@ -251,15 +251,16 @@
6 really conflicts
7 returns 0 if conflicts <> replaces or 1 if conflicts == replaces
8 */
9-int is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg){
10-
11-int i ;
12-int replaces_count = pkg->replaces_count;
13+int is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg)
14+{
15+ int i ;
16+ int replaces_count = pkg->replaces_count;
17+ abstract_pkg_t **replaces;
18
19- if (pkg->replaces_count==0) // No replaces, it's surely a conflict
20- return 0;
21+ if (pkg->replaces_count==0) // No replaces, it's surely a conflict
22+ return 0;
23
24- abstract_pkg_t **replaces = pkg->replaces;
25+ replaces = pkg->replaces;
26
27 for (i = 0; i < replaces_count; i++) {
28 if (strcmp(pkg_scout->name,pkg->replaces[i]->name)==0) // Found
29@@ -280,6 +281,8 @@
30 register int i, j, k;
31 int count;
32 abstract_pkg_t * ab_pkg;
33+ pkg_t **pkg_scouts;
34+ pkg_t *pkg_scout;
35
36 /*
37 * this is a setup to check for redundant/cyclic dependency checks,
38@@ -316,9 +319,9 @@
39 if (test_vec) {
40 /* pkg_vec found, it is an actual package conflict
41 * cruise this possiblity's pkg_vec looking for an installed version */
42- pkg_t **pkg_scouts = test_vec->pkgs;
43+ pkg_scouts = test_vec->pkgs;
44 for(k = 0; k < test_vec->len; k++){
45- pkg_t *pkg_scout = pkg_scouts[k];
46+ pkg_scout = pkg_scouts[k];
47 if (!pkg_scout) {
48 fprintf(stderr, "%s: null pkg scout\n", __FUNCTION__);
49 continue;
50@@ -381,13 +384,16 @@
51 abstract_pkg_vec_t *provider_apkgs = apkg->provided_by;
52 int n_providers = provider_apkgs->len;
53 abstract_pkg_t **apkgs = provider_apkgs->pkgs;
54+ pkg_vec_t *pkg_vec;
55+ int n_pkgs ;
56 int i;
57+ int j;
58+
59 for (i = 0; i < n_providers; i++) {
60 abstract_pkg_t *papkg = apkgs[i];
61- pkg_vec_t *pkg_vec = papkg->pkgs;
62+ pkg_vec = papkg->pkgs;
63 if (pkg_vec) {
64- int n_pkgs = pkg_vec->len;
65- int j;
66+ n_pkgs = pkg_vec->len;
67 for (j = 0; j < n_pkgs; j++) {
68 pkg_t *pkg = pkg_vec->pkgs[j];
69 if (version_constraints_satisfied(depend, pkg)) {
70@@ -406,12 +412,14 @@
71 int n_providers = provider_apkgs->len;
72 abstract_pkg_t **apkgs = provider_apkgs->pkgs;
73 int i;
74+ int n_pkgs;
75+ int j;
76+
77 for (i = 0; i < n_providers; i++) {
78 abstract_pkg_t *papkg = apkgs[i];
79 pkg_vec_t *pkg_vec = papkg->pkgs;
80 if (pkg_vec) {
81- int n_pkgs = pkg_vec->len;
82- int j;
83+ n_pkgs = pkg_vec->len;
84 for (j = 0; j < n_pkgs; j++) {
85 pkg_t *pkg = pkg_vec->pkgs[j];
86 if (version_constraints_satisfied(depend, pkg)) {
87@@ -532,11 +540,15 @@
88 abstract_pkg_t **conflictee_provides = conflictee->provides;
89 int conflictee_provides_count = conflictee->provides_count;
90 int i, j, k;
91+ int possibility_count;
92+ struct depend **possibilities;
93+ abstract_pkg_t *possibility ;
94+
95 for (i = 0; i < conflicts_count; i++) {
96- int possibility_count = conflicts[i].possibility_count;
97- struct depend **possibilities = conflicts[i].possibilities;
98+ possibility_count = conflicts[i].possibility_count;
99+ possibilities = conflicts[i].possibilities;
100 for (j = 0; j < possibility_count; j++) {
101- abstract_pkg_t *possibility = possibilities[j]->pkg;
102+ possibility = possibilities[j]->pkg;
103 for (k = 0; k < conflictee_provides_count; k++) {
104 if (possibility == conflictee_provides[k]) {
105 return 1;
106@@ -832,6 +844,8 @@
107 compound_depend_t * depends;
108 int count, othercount;
109 register int i, j;
110+ abstract_pkg_t * ab_depend;
111+ abstract_pkg_t ** temp;
112
113 count = pkg->pre_depends_count + pkg->depends_count;
114 depends = pkg->depends;
115@@ -843,8 +857,7 @@
116 if (0 && pkg->pre_depends_count)
117 fprintf(stderr, " i=%d possibility_count=%x depends=%p\n", i, depends->possibility_count, depends);
118 for (j = 0; j < depends->possibility_count; j++){
119- abstract_pkg_t * ab_depend = depends->possibilities[j]->pkg;
120- abstract_pkg_t ** temp;
121+ ab_depend = depends->possibilities[j]->pkg;
122 if(!ab_depend->depended_upon_by)
123 ab_depend->depended_upon_by = (abstract_pkg_t **)calloc(1, sizeof(abstract_pkg_t *));
124