Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit23bd779

Browse files
committed
Change ET_WARN to ET_NOTICE to match internal codes, leave message as
WARNING. Fix German FAQ mention about warning.
1 parent7d6af50 commit23bd779

File tree

7 files changed

+20
-20
lines changed

7 files changed

+20
-20
lines changed

‎doc/FAQ_german‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@
515515

516516
* �berpr�fe, da� keine Binaries vorheriger Versionen in Deinem Pfad
517517
(PATH-Variable) sind. (Wenn Du die Meldung siehst:
518-
WARN:heap_modifytuple: repl is \ 9, ist das das Problem.)
518+
NOTICE:heap_modifytuple: repl is \ 9, ist das das Problem.)
519519
* �berpr�fe, da� der Pfad richtig gesetzt ist
520520
* �berpr�fe, ob der User postgres der Eigent�mer der entsprechenden
521521
Dateien ist

‎doc/src/FAQ/FAQ_german.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ <H4><a name="3.1">3.1</a>)Warum schl&auml;gt initdb fehl?</H4><P>
540540
<LI>
541541
&uuml;berpr&uuml;fe, da&szlig; keine Binaries vorheriger Versionen in Deinem Pfad
542542
(PATH-Variable) sind.
543-
(Wenn Du die Meldung siehst:<CODE>WARN:heap_modifytuple: repl is \ 9</CODE>, ist das das Problem.)
543+
(Wenn Du die Meldung siehst:<CODE>NOTICE:heap_modifytuple: repl is \ 9</CODE>, ist das das Problem.)
544544
<Li> &uuml;berpr&uuml;fe, da&szlig; der Pfad richtig gesetzt ist
545545
<LI> &uuml;berpr&uuml;fe, ob der User<I>postgres</I> der Eigent&uuml;mer der entsprechenden Dateien ist
546546
</UL><P>

‎src/bin/pgaccess/lib/help/create_database.hlp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CREATE DATABASE name \[ WITH LOCATION = 'dbpath' \]
1818
" {} "CREATEDB" {italic} "
1919
Message returned if the command completes successfully.
2020

21-
" {} "WARN: createdb: database \"name\" already exists." {italic} "
21+
" {} "NOTICE: createdb: database \"name\" already exists." {italic} "
2222
This occurs if database specified already exists.
2323

2424
" {} "ERROR: Unable to create database directory directory" {italic} "

‎src/interfaces/ecpg/preproc/descriptor.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ drop_descriptor(char *name, char *connection)
109109
}
110110
}
111111
snprintf(errortext,sizeoferrortext,"unknown descriptor %s",name);
112-
mmerror(ET_WARN,errortext);
112+
mmerror(ET_NOTICE,errortext);
113113
}
114114

115115
structdescriptor
@@ -128,7 +128,7 @@ struct descriptor
128128
}
129129
}
130130
snprintf(errortext,sizeoferrortext,"unknown descriptor %s",name);
131-
mmerror(ET_WARN,errortext);
131+
mmerror(ET_NOTICE,errortext);
132132
returnNULL;
133133
}
134134

@@ -145,7 +145,7 @@ output_get_descr_header(char *desc_name)
145145
else
146146
{
147147
snprintf(errortext,sizeoferrortext,"unknown descriptor header item '%d'",results->value);
148-
mmerror(ET_WARN,errortext);
148+
mmerror(ET_NOTICE,errortext);
149149
}
150150
}
151151

@@ -167,10 +167,10 @@ output_get_descr(char *desc_name, char *index)
167167
switch (results->value)
168168
{
169169
caseECPGd_nullable:
170-
mmerror(ET_WARN,"nullable is always 1");
170+
mmerror(ET_NOTICE,"nullable is always 1");
171171
break;
172172
caseECPGd_key_member:
173-
mmerror(ET_WARN,"key_member is always 0");
173+
mmerror(ET_NOTICE,"key_member is always 0");
174174
break;
175175
default:
176176
break;

‎src/interfaces/ecpg/preproc/pgc.l‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*
1414
* IDENTIFICATION
15-
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.69 2000/12/03 20:45:38 tgl Exp $
15+
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.70 2000/12/15 20:01:55 momjian Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -392,7 +392,7 @@ cppline{space}*#(.*\\{line_end})*.*
392392
literalbuf, NAMEDATALEN-1, literalbuf);
393393
literalbuf[NAMEDATALEN-1] ='\0';
394394
#endif
395-
mmerror(ET_WARN, errortext);
395+
mmerror(ET_NOTICE, errortext);
396396
}
397397

398398
yylval.str =mm_strdup(literalbuf);
@@ -554,7 +554,7 @@ cppline{space}*#(.*\\{line_end})*.*
554554
lower_text, NAMEDATALEN-1, lower_text);
555555
lower_text[NAMEDATALEN-1] ='\0';
556556
#endif
557-
mmerror(ET_WARN, errortext);
557+
mmerror(ET_NOTICE, errortext);
558558
yytext[NAMEDATALEN-1] ='\0';
559559
}
560560

‎src/interfaces/ecpg/preproc/preproc.y‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ mmerror(enum errortype type, char * error)
4242
{
4343
switch(type)
4444
{
45-
caseET_WARN:
45+
caseET_NOTICE:
4646
fprintf(stderr,"%s:%d: WARNING: %s\n", input_filename, yylineno, error);
4747
break;
4848
case ET_ERROR:
@@ -1124,7 +1124,7 @@ columnDef: ColId Typename ColQualList opt_collate
11241124
if (strlen($4) >0)
11251125
{
11261126
sprintf(errortext,"CREATE TABLE/COLLATE %s not yet implemented; clause ignored", $4);
1127-
mmerror(ET_WARN, errortext);
1127+
mmerror(ET_NOTICE, errortext);
11281128
}
11291129
$$ = cat_str(4,$1,$2,$3,$4);
11301130
}
@@ -1133,7 +1133,7 @@ columnDef: ColId Typename ColQualList opt_collate
11331133
if (strlen($4) >0)
11341134
{
11351135
sprintf(errortext,"CREATE TABLE/COLLATE %s not yet implemented; clause ignored", $4);
1136-
mmerror(ET_WARN, errortext);
1136+
mmerror(ET_NOTICE, errortext);
11371137
}
11381138
$$ = cat_str(4,$1, make_str(" serial"),$3,$4);
11391139
}
@@ -1248,7 +1248,7 @@ key_match: MATCH FULL
12481248
}
12491249
|MATCHPARTIAL
12501250
{
1251-
mmerror(ET_WARN,"FOREIGN KEY/MATCH PARTIAL not yet implemented");
1251+
mmerror(ET_NOTICE,"FOREIGN KEY/MATCH PARTIAL not yet implemented");
12521252
$$ = make_str("match partial");
12531253
}
12541254
|/*EMPTY*/
@@ -1651,7 +1651,7 @@ direction:FORWARD{ $$ = make_str("forward"); }
16511651
|BACKWARD{$$ = make_str("backward"); }
16521652
|RELATIVE {$$ = make_str("relative"); }
16531653
|ABSOLUTE{
1654-
mmerror(ET_WARN,"FETCH/ABSOLUTE not supported, backend will use RELATIVE");
1654+
mmerror(ET_NOTICE,"FETCH/ABSOLUTE not supported, backend will use RELATIVE");
16551655
$$ = make_str("absolute");
16561656
}
16571657
;
@@ -3512,7 +3512,7 @@ c_expr: attr
35123512
if (atol($3) !=0)
35133513
{
35143514
sprintf(errortext,"CURRENT_TIME(%s) precision not implemented; backend will use zero instead", $3);
3515-
mmerror(ET_WARN, errortext);
3515+
mmerror(ET_NOTICE, errortext);
35163516
}
35173517

35183518
$$ = make_str("current_time");
@@ -3524,7 +3524,7 @@ c_expr: attr
35243524
if (atol($3) !=0)
35253525
{
35263526
sprintf(errortext,"CURRENT_TIMESTAMP(%s) precision not implemented; backend will use zero instead", $3);
3527-
mmerror(ET_WARN, errortext);
3527+
mmerror(ET_NOTICE, errortext);
35283528
}
35293529

35303530
$$ = make_str("current_timestamp");
@@ -3664,7 +3664,7 @@ case_expr: CASE case_arg when_clause_list case_default END_TRANS
36643664
{
36653665
$$ = cat_str(5, make_str("nullif("),$3, make_str(","),$5, make_str(")"));
36663666

3667-
mmerror(ET_WARN,"NULLIF() not yet fully implemented");
3667+
mmerror(ET_NOTICE,"NULLIF() not yet fully implemented");
36683668
}
36693669
|COALESCE'('expr_list')'
36703670
{

‎src/interfaces/ecpg/preproc/type.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ struct assignment
155155

156156
enumerrortype
157157
{
158-
ET_WARN,ET_ERROR,ET_FATAL
158+
ET_NOTICE,ET_ERROR,ET_FATAL
159159
};
160160

161161
structfetch_desc

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp