Searched refs:conflict (Results 1 - 25 of 49) sorted by relevance

12

/freebsd-current/contrib/ntp/ntpd/
H A Dntpd-opts.h172 # warning undefining IPV4 due to option name conflict
176 # warning undefining IPV6 due to option name conflict
180 # warning undefining AUTHREQ due to option name conflict
184 # warning undefining AUTHNOREQ due to option name conflict
188 # warning undefining BCASTSYNC due to option name conflict
192 # warning undefining CONFIGFILE due to option name conflict
196 # warning undefining DEBUG_LEVEL due to option name conflict
200 # warning undefining SET_DEBUG_LEVEL due to option name conflict
204 # warning undefining DRIFTFILE due to option name conflict
208 # warning undefining PANICGATE due to option name conflict
[all...]
/freebsd-current/usr.sbin/etcupdate/tests/
H A Dfbsdid_test.sh131 # conflict: Modify a file where the local file has a different
132 # FreeBSD ID string. This should still generate a conflict
134 store_id $OLD/conflict ": head/conflict 12000 jhb "
135 store_id $NEW/conflict ": head/conflict 12345 jhb "
136 store_id $TEST/conflict ""
137 cat >> $OLD/conflict <<EOF
141 cat >> $NEW/conflict <<EOF
145 cat >> $TEST/conflict <<EO
256 conflict() function
[all...]
H A Dalways_test.sh86 # What follows are the various warning/conflict cases from the
143 # generate a new link conflict.
151 # This should generate a new file conflict.
189 # to the new file if possible. If the merge fails, a conflict
191 # conflict case.
192 cat > $OLD/difffiles/difffiles/difffiles/conflict <<EOF
195 cat > $NEW/difffiles/difffiles/difffiles/conflict <<EOF
198 cat > $TEST/difffiles/difffiles/difffiles/conflict <<EOF
205 # /adddir/conflict: Add a new file in a directory that already
207 mkdir $NEW/adddir/conflict
354 conflict() function
[all...]
H A Dtests_test.sh310 # generate a new link conflict.
318 # This should generate a new file conflict.
431 # to the new file if possible. If the merge fails, a conflict
446 cat > $OLD/difffiles/difffiles/difffiles/conflict <<EOF
449 cat > $NEW/difffiles/difffiles/difffiles/conflict <<EOF
452 cat > $TEST/difffiles/difffiles/difffiles/conflict <<EOF
464 # /adddir/conflict: Add a new file in a directory that already
466 mkdir $NEW/adddir/conflict
467 touch $NEW/adddir/conflict/newfile
468 touch $TEST/adddir/conflict
732 conflict() function
[all...]
H A Dconflicts_test.sh67 # generate a conflict in /etc/login.conf. Each resolve option is tested
75 # Generate a conflict in /etc/login.conf.
102 # Generate a conflict in /etc/mail/aliases
175 # $1 - relative path to a regular file that should have a conflict
176 # $2 - optional MD5 of the conflict file contents
177 conflict() function
182 echo "File $1 missing conflict"
193 # $1 - relative path to a regular file that should no longer have a conflict
221 conflict /etc/login.conf
223 # Verify that 'mf' removes the conflict, bu
[all...]
H A Dpreworld_test.sh188 # $1 - relative path to a regular file that should have a conflict
189 # $2 - optional MD5 of the conflict file contents
190 conflict() function
195 echo "File $1 missing conflict"
H A Dignore_test.sh149 # $1 - relative path to a regular file that should have a conflict
150 # $2 - optional MD5 of the conflict file contents
151 conflict() function
156 echo "File $1 missing conflict"
167 # $1 - relative path to a regular file that should not have a conflict
171 echo "File $1 should not have a conflict"
/freebsd-current/contrib/ntp/util/
H A Dntp-keygen-opts.h161 # warning undefining IMBITS due to option name conflict
165 # warning undefining CERTIFICATE due to option name conflict
169 # warning undefining CIPHER due to option name conflict
173 # warning undefining DEBUG_LEVEL due to option name conflict
177 # warning undefining SET_DEBUG_LEVEL due to option name conflict
181 # warning undefining ID_KEY due to option name conflict
185 # warning undefining GQ_PARAMS due to option name conflict
189 # warning undefining HOST_KEY due to option name conflict
193 # warning undefining IFFKEY due to option name conflict
197 # warning undefining IDENT due to option name conflict
[all...]
/freebsd-current/contrib/ntp/sntp/
H A Dsntp-opts.h158 # warning undefining IPV4 due to option name conflict
162 # warning undefining IPV6 due to option name conflict
166 # warning undefining AUTHENTICATION due to option name conflict
170 # warning undefining BROADCAST due to option name conflict
174 # warning undefining CONCURRENT due to option name conflict
178 # warning undefining DEBUG_LEVEL due to option name conflict
182 # warning undefining SET_DEBUG_LEVEL due to option name conflict
186 # warning undefining GAP due to option name conflict
190 # warning undefining KOD due to option name conflict
194 # warning undefining KEYFILE due to option name conflict
[all...]
/freebsd-current/contrib/ntp/ntpq/
H A Dntpq-opts.h152 # warning undefining IPV4 due to option name conflict
156 # warning undefining IPV6 due to option name conflict
160 # warning undefining COMMAND due to option name conflict
164 # warning undefining DEBUG_LEVEL due to option name conflict
168 # warning undefining SET_DEBUG_LEVEL due to option name conflict
172 # warning undefining INTERACTIVE due to option name conflict
176 # warning undefining NUMERIC due to option name conflict
180 # warning undefining OLD_RV due to option name conflict
184 # warning undefining PEERS due to option name conflict
188 # warning undefining REFID due to option name conflict
[all...]
/freebsd-current/contrib/ntp/ntpdc/
H A Dntpdc-opts.h151 # warning undefining IPV4 due to option name conflict
155 # warning undefining IPV6 due to option name conflict
159 # warning undefining COMMAND due to option name conflict
163 # warning undefining DEBUG_LEVEL due to option name conflict
167 # warning undefining SET_DEBUG_LEVEL due to option name conflict
171 # warning undefining INTERACTIVE due to option name conflict
175 # warning undefining LISTPEERS due to option name conflict
179 # warning undefining NUMERIC due to option name conflict
183 # warning undefining PEERS due to option name conflict
187 # warning undefining SHOWPEERS due to option name conflict
[all...]
/freebsd-current/contrib/ntp/ntpsnmpd/
H A Dntpsnmpd-opts.h143 # warning undefining NOFORK due to option name conflict
147 # warning undefining SYSLOG due to option name conflict
151 # warning undefining AGENTXSOCKET due to option name conflict
/freebsd-current/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/
H A Dtst.entryreturn.ksh54 * the conflict with a reserved word.
/freebsd-current/usr.bin/localedef/
H A Dctype.c332 int conflict = 0; local
399 conflict++;
402 conflict++;
404 conflict++;
406 conflict++;
408 conflict++;
410 if (conflict) {
/freebsd-current/crypto/openssl/crypto/engine/
H A Deng_list.c59 int conflict = 0; local
67 while (iterator && !conflict) {
68 conflict = (strcmp(iterator->id, e->id) == 0);
71 if (conflict) {
/freebsd-current/contrib/diff/src/
H A Ddiff3.c1497 bool conflict;
1514 case DIFF_2ND: if (!show_2nd) continue; conflict = true; break;
1515 case DIFF_3RD: if (overlap_only) continue; conflict = false; break;
1516 case DIFF_ALL: if (simple_only) continue; conflict = flagging; break;
1522 if (conflict)
1527 /* Mark end of conflict. */
1549 /* Mark start of conflict. */
1614 bool conflict;
1631 case DIFF_2ND: if (!show_2nd) continue; conflict = true; break;
1632 case DIFF_3RD: if (overlap_only) continue; conflict
1493 bool conflict; local
1610 bool conflict; local
[all...]
/freebsd-current/contrib/bmake/mk/
H A Dwhats.mk33 # a unique name that won't conflict with anything
/freebsd-current/contrib/sendmail/contrib/
H A Dcidrexpand235 -O When a CIDR expansion would generate a partial conflict
/freebsd-current/contrib/dialog/package/
H A Ddialog.spec32 This package installs as "cdialog" to avoid conflict with other packages.
/freebsd-current/sbin/gvinum/
H A Dgvinum.c572 int i, n, begin, len, conflict; local
600 conflict = 0;
626 conflict = 1;
631 if (!conflict)
/freebsd-current/sys/contrib/openzfs/module/os/linux/zfs/
H A Dzfs_dir.c67 boolean_t conflict = B_FALSE; local
84 zoid, mt, buf, bufsz, &conflict);
100 *deflags = conflict ? ED_CASE_CONFLICT : 0;
/freebsd-current/sys/contrib/openzfs/module/lua/
H A Dlparser.c1114 int conflict = 0; local
1119 conflict = 1;
1125 conflict = 1;
1130 if (conflict) {
/freebsd-current/sys/conf/
H A Dkern.opts.mk104 # PR251083 conflict between INIT_ALL_ZERO and ifunc memset
/freebsd-current/contrib/lua/src/
H A Dlparser.c1334 int conflict = 0; local
1339 conflict = 1; /* table is the upvalue being assigned now */
1346 conflict = 1; /* table is the local being assigned now */
1352 conflict = 1;
1358 if (conflict) {
/freebsd-current/share/mk/
H A Dmeta.stage.mk73 # a staging conflict should cause an error

Completed in 409 milliseconds

12