Mercurial > hg > xemacs-beta

comparison modules/postgresql/postgresql.c @ 4953:304aebb79cd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
function renamings to track names of char typedefs -------------------- ChangeLog entries follow: -------------------- man/ChangeLog addition: 2010-01-27 Ben Wing <ben@xemacs.org> * internals/internals.texi (lrecords): * internals/internals.texi (The DFC API): * internals/internals.texi (Conversion to and from External Data): * internals/internals.texi (Mule-izing Code): * internals/internals.texi (Pervasive changes throughout XEmacs sources): * internals/internals.texi (Ben's README): * internals/internals.texi (Future Work -- Localized Text/Messages): * emodules.texi (Defining Variables): Rename: write_c_string -> write_cistring build_intstring -> build_istring build_string -> build_cistring build_ext_string -> build_extstring make_ext_string -> make_extstring buffer_insert_c_string -> buffer_insert_ascstring intern_int -> intern_istring See comment in src/ChangeLog about this. modules/ChangeLog addition: 2010-01-27 Ben Wing <ben@xemacs.org> * postgresql/postgresql.c (print_pgconn): * postgresql/postgresql.c (print_pgresult): * postgresql/postgresql.c (Fpq_conn_defaults): * postgresql/postgresql.c (Fpq_pgconn): * postgresql/postgresql.c (Fpq_res_status): * postgresql/postgresql.c (Fpq_result_error_message): * postgresql/postgresql.c (Fpq_fname): * postgresql/postgresql.c (Fpq_get_value): * postgresql/postgresql.c (Fpq_cmd_status): * postgresql/postgresql.c (Fpq_cmd_tuples): * postgresql/postgresql.c (Fpq_notifies): * postgresql/postgresql.c (Fpq_get_line): * postgresql/postgresql.c (Fpq_get_line_async): * postgresql/postgresql.c (FROB): * postgresql/postgresql.c (init_postgresql_from_environment): * ldap/eldap.c: * ldap/eldap.c (Fldap_open): * ldap/eldap.c (Fldap_search_basic): * canna/canna_api.c: * canna/canna_api.c (make_euc_string): Rename: write_c_string -> write_cistring build_intstring -> build_istring build_string -> build_cistring build_ext_string -> build_extstring make_ext_string -> make_extstring buffer_insert_c_string -> buffer_insert_ascstring intern_int -> intern_istring See comment in src/ChangeLog about this. src/ChangeLog addition: 2010-01-27 Ben Wing <ben@xemacs.org> * .gdbinit.in.in: * README: * abbrev.c (write_abbrev): * abbrev.c (describe_abbrev): * alloc.c (make_extstring): * alloc.c (build_istring): * alloc.c (build_cistring): * alloc.c (build_ascstring): * alloc.c (build_extstring): * alloc.c (build_msg_istring): * alloc.c (build_defer_istring): * buffer.c (Fgenerate_new_buffer_name): * buffer.c (init_buffer_2): * console-tty.c (tty_init_console): * console-x.c (get_display_arg_connection): * console-x.c (x_perhaps_init_unseen_key_defaults): * database.c (dbm_map): * database.c (dbm_get): * database.c (berkdb_get): * database.c (berkdb_map): * device-gtk.c (FROB_PIXMAP): * device-gtk.c (Fgtk_style_info): * device-msw.c (msprinter_default_printer): * device-msw.c (sync_printer_with_devmode): * device-x.c (coding_system_of_xrm_database): * device-x.c (x_init_device): * device-x.c (signal_if_x_error): * device-x.c (Fx_get_resource): * device-x.c (Fx_server_vendor): * device-x.c (Fx_get_font_path): * dialog-x.c (maybe_run_dbox_text_callback): * doc.c (extract_object_file_name): * doc.c (unparesseuxify_doc_string): * doc.c (get_doc_string): * doc.c (get_object_file_name): * doc.c (Fdocumentation): * doc.c (Fsnarf_documentation): * doc.c (Fsubstitute_command_keys): * editfns.c (init_editfns): * editfns.c (Ftemp_directory): * editfns.c (Fuser_login_name): * editfns.c (Fuser_real_login_name): * editfns.c (Fuser_home_directory): * editfns.c (Fformat_time_string): * editfns.c (Fcurrent_time_string): * editfns.c (Fcurrent_time_zone): * emacs.c: * emacs.c (main_1): * emodules.c (Flist_modules): * emodules.c (emodules_load): * emodules.c (emodules_doc_sym): * emodules.c (vars_of_module): * event-Xt.c (x_has_keysym): * event-gtk.c (emacs_gtk_format_magic_event): * event-gtk.c (dragndrop_data_received): * event-gtk.c (gtk_reset_key_mapping): * event-msw.c (mswindows_dde_callback): * event-msw.c (mswindows_wnd_proc): * faces.c (complex_vars_of_faces): * file-coding.c (find_coding_system): * file-coding.c (setup_eol_coding_systems): * file-coding.c (make_coding_system_1): * file-coding.c (snarf_coding_system): * fileio.c: * fileio.c (lisp_strerror): * fileio.c (Ffile_name_directory): * fileio.c (Ffile_name_as_directory): * fileio.c (Fdirectory_file_name): * fileio.c (if): * fileio.c (Ffile_symlink_p): * fileio.c (Fencrypt_string): * fileio.c (Fdecrypt_string): * filelock.c (lock_file): * filelock.c (Ffile_locked_p): * floatfns.c (matherr): * font-mgr.c (build_fcapi_string): * font-mgr.c (make_xlfd_font_regexp): * frame-msw.c (mswindows_window_id): * frame-msw.c (mswindows_frame_property): * frame-x.c: * frame-x.c (color_to_string): * frame-x.c (maybe_set_frame_title_format): * frame-x.c (x_cde_transfer_callback): * frame-x.c (Fx_window_id): * glade.c (connector): * glade.c (Fglade_xml_textdomain): * glade.c (syms_of_glade): * glyphs-eimage.c (jpeg_instantiate): * glyphs-eimage.c (png_instantiate): * glyphs-eimage.c (tiff_instantiate): * glyphs-gtk.c (font_instantiate): * glyphs-gtk.c (BUILD_GLYPH_INST): * glyphs-x.c (x_locate_pixmap_file): * glyphs-x.c (font_instantiate): * glyphs-x.c (x_widget_property): * glyphs-x.c (BUILD_GLYPH_INST): * glyphs.c (print_image_instance): * glyphs.c (bitmap_to_lisp_data): * glyphs.c (pixmap_to_lisp_data): * gpmevent.c (turn_off_gpm): * gpmevent.c (Fgpm_enabled_p): * gpmevent.c (Fgpm_enable): * gtk-glue.c (__make_string_mapper): * gtk-glue.c (xemacs_gtklist_to_list): * gtk-xemacs.c (FROB_FACE): * gtk-xemacs.c (xemacs_gtk_convert_color): * hpplay.c (player_error_internal): * hpplay.c (myHandler): * insdel.c (buffer_insert_ascstring_1): * insdel.h: * insdel.h (buffer_insert_ascstring): * intl.c (Fcurrent_locale): * intl.c (Fset_current_locale): * keymap.c (make_key_description): * keymap.c (Ftext_char_description): * keymap.c (describe_command): * keymap.c (describe_map): * lisp.h: * lread.c: * lread.c (locate_file_in_directory_mapper): * lread.c (locate_file_construct_suffixed_files_mapper): * mule-charset.c (Fmake_charset): * nt.c (Fmswindows_short_file_name): * nt.c (Fmswindows_long_file_name): * objects-gtk.c (__get_gtk_font_truename): * objects-gtk.c (__gtk_font_list_internal): * objects-msw.c (font_enum_callback_2): * objects-msw.c (create_hfont_from_font_spec): * objects-msw.c (mswindows_font_list): * objects-msw.c (mswindows_font_spec_matches_charset_stage_2): * objects-tty.c (tty_initialize_font_instance): * objects-x.c (x_font_truename): * objects-x.c (x_font_instance_truename): * objects-x.c (x_font_instance_properties): * objects-x.c (x_font_list): * print.c (write_cistring): * print.c (print_vector_internal): * print.c (print_cons): * process-nt.c (nt_canonicalize_host_name): * process-unix.c (unix_create_process): * process-unix.c (unix_canonicalize_host_name): * process.c (status_message): * process.c (status_notify): * process.c (init_xemacs_process): * process.c (syms_of_process): * redisplay-tty.c (term_get_fkeys_1): * redisplay-tty.c (CONDITIONAL_REASSIGN): * search.c (compile_pattern_1): * select-common.h (selection_data_to_lisp_data): * select-gtk.c (atom_to_symbol): * select-gtk.c (PROCESSING_GTK_CODE): * select-msw.c (mswindows_get_foreign_selection): * select-x.c (x_atom_to_symbol): * select-x.c (Fx_get_cutbuffer_internal): * symbols.c (intern_istring): * symbols.c (intern): * symbols.c (intern_converting_underscores_to_dashes): * symbols.c (Fintern): * sysdep.c (init_system_name): * sysdll.c (dll_error): * sysdll.c (dll_open): * syswindows.h: * syswindows.h (build_tstr_string): * tests.c (DFC_CHECK_LENGTH): * tests.c (DFC_CHECK_CONTENT): * tests.c (DFC_RESULT_PASS): * tests.c (Ftest_data_format_conversion): * text.c: * text.c (new_dfc_convert_now_damn_it): * text.h: * text.h (build_wext_string): * tooltalk.c (tt_build_c_string): * tooltalk.c (Ftooltalk_default_procid): * tooltalk.c (Ftooltalk_default_session): * tooltalk.c (init_tooltalk): * ui-byhand.c (Fgtk_clist_get_text): * ui-byhand.c (Fgtk_clist_get_pixtext): * ui-byhand.c (Fgtk_label_get): * ui-byhand.c (Fgtk_notebook_query_tab_label_packing): * ui-gtk.c (emacs_gtk_object_printer): * ui-gtk.c (emacs_gtk_boxed_printer): * ui-gtk.c (gtk_type_to_lisp): * ui-gtk.c (symbol_to_enum): * ui-gtk.c (enum_to_symbol): * unexaix.c (report_error): * unexaix.c (ERROR0): * unexec.c (report_error): * unexec.c (ERROR0): * unicode.c (unicode_to_ichar): * win32.c (tstr_to_local_file_format): * win32.c (Fmswindows_cygwin_to_win32_path): * win32.c (struct read_link_hash): * xemacs.def.in.in: Rename: write_c_string -> write_cistring build_intstring -> build_istring build_string -> build_cistring build_ext_string -> build_extstring make_ext_string -> make_extstring buffer_insert_c_string -> buffer_insert_ascstring intern_int -> intern_istring These functions have been renamed so that the naming harmonizes with the typedefs for strings: `cistring' along with CIbyte *, `istring' along with Ibyte *, `extstring' along with Extbyte *, `ascstring' along with Ascbyte *. Also make buffer_insert_ascstring take Ascbyte * and assert that its argument is ASCII.
author Ben Wing <ben@xemacs.org>
date Wed, 27 Jan 2010 00:35:36 -0600
parents 19a72041c5ed
children 4aebb0131297
comparison
equal deleted inserted replaced
4952:19a72041c5ed 4953:304aebb79cd3
242 strcpy (buf, "#<PGconn connecting>"); /* evil! */ 242 strcpy (buf, "#<PGconn connecting>"); /* evil! */
243 243
244 if (print_readably) 244 if (print_readably)
245 printing_unreadable_object ("%s", buf); 245 printing_unreadable_object ("%s", buf);
246 else 246 else
247 write_c_string (printcharfun, buf); 247 write_cistring (printcharfun, buf);
248 } 248 }
249 249
250 static Lisp_PGconn * 250 static Lisp_PGconn *
251 allocate_pgconn (void) 251 allocate_pgconn (void)
252 { 252 {
363 strcpy (buf, "#<PGresult DEAD>"); /* evil! */ 363 strcpy (buf, "#<PGresult DEAD>"); /* evil! */
364 364
365 if (print_readably) 365 if (print_readably)
366 printing_unreadable_object ("%s", buf); 366 printing_unreadable_object ("%s", buf);
367 else 367 else
368 write_c_string (printcharfun, buf); 368 write_cistring (printcharfun, buf);
369 } 369 }
370 370
371 #undef RESULT_TUPLES_FMT 371 #undef RESULT_TUPLES_FMT
372 #undef RESULT_CMD_TUPLES_FMT 372 #undef RESULT_CMD_TUPLES_FMT
373 #undef RESULT_DEFAULT_FMT 373 #undef RESULT_DEFAULT_FMT
443 int i; 443 int i;
444 444
445 pcio = PQconndefaults(); 445 pcio = PQconndefaults();
446 if (!pcio) return Qnil; /* can never happen in libpq-7.0 */ 446 if (!pcio) return Qnil; /* can never happen in libpq-7.0 */
447 temp = 447 temp =
448 list1 (nconc2 (list4 (build_ext_string (pcio[0].keyword, PG_OS_CODING), 448 list1 (nconc2 (list4 (build_extstring (pcio[0].keyword, PG_OS_CODING),
449 build_ext_string (pcio[0].envvar, PG_OS_CODING), 449 build_extstring (pcio[0].envvar, PG_OS_CODING),
450 build_ext_string (pcio[0].compiled, PG_OS_CODING), 450 build_extstring (pcio[0].compiled, PG_OS_CODING),
451 build_ext_string (pcio[0].val, PG_OS_CODING)), 451 build_extstring (pcio[0].val, PG_OS_CODING)),
452 list3 (build_ext_string (pcio[0].label, PG_OS_CODING), 452 list3 (build_extstring (pcio[0].label, PG_OS_CODING),
453 build_ext_string (pcio[0].dispchar, PG_OS_CODING), 453 build_extstring (pcio[0].dispchar, PG_OS_CODING),
454 make_int (pcio[0].dispsize)))); 454 make_int (pcio[0].dispsize))));
455 455
456 for (i = 1; pcio[i].keyword; i++) 456 for (i = 1; pcio[i].keyword; i++)
457 { 457 {
458 temp1 = 458 temp1 =
459 list1 (nconc2 (list4 (build_ext_string (pcio[i].keyword, PG_OS_CODING), 459 list1 (nconc2 (list4 (build_extstring (pcio[i].keyword, PG_OS_CODING),
460 build_ext_string (pcio[i].envvar, PG_OS_CODING), 460 build_extstring (pcio[i].envvar, PG_OS_CODING),
461 build_ext_string (pcio[i].compiled, PG_OS_CODING), 461 build_extstring (pcio[i].compiled, PG_OS_CODING),
462 build_ext_string (pcio[i].val, PG_OS_CODING)), 462 build_extstring (pcio[i].val, PG_OS_CODING)),
463 list3 (build_ext_string (pcio[i].label, PG_OS_CODING), 463 list3 (build_extstring (pcio[i].label, PG_OS_CODING),
464 build_ext_string (pcio[i].dispchar, PG_OS_CODING), 464 build_extstring (pcio[i].dispchar, PG_OS_CODING),
465 make_int (pcio[i].dispsize)))); 465 make_int (pcio[i].dispsize))));
466 { 466 {
467 Lisp_Object args[2]; 467 Lisp_Object args[2];
468 args[0] = temp; 468 args[0] = temp;
469 args[1] = temp1; 469 args[1] = temp1;
832 832
833 if (EQ(field, Qpqdb)) 833 if (EQ(field, Qpqdb))
834 /* PQdb Returns the database name of the connection. 834 /* PQdb Returns the database name of the connection.
835 char *PQdb(PGconn *conn) 835 char *PQdb(PGconn *conn)
836 */ 836 */
837 return build_ext_string (PQdb(P), PG_OS_CODING); 837 return build_extstring (PQdb(P), PG_OS_CODING);
838 else if (EQ (field, Qpquser)) 838 else if (EQ (field, Qpquser))
839 /* PQuser Returns the user name of the connection. 839 /* PQuser Returns the user name of the connection.
840 char *PQuser(PGconn *conn) 840 char *PQuser(PGconn *conn)
841 */ 841 */
842 return build_ext_string (PQuser(P), PG_OS_CODING); 842 return build_extstring (PQuser(P), PG_OS_CODING);
843 else if (EQ (field, Qpqpass)) 843 else if (EQ (field, Qpqpass))
844 /* PQpass Returns the password of the connection. 844 /* PQpass Returns the password of the connection.
845 char *PQpass(PGconn *conn) 845 char *PQpass(PGconn *conn)
846 */ 846 */
847 return build_ext_string (PQpass(P), PG_OS_CODING); 847 return build_extstring (PQpass(P), PG_OS_CODING);
848 else if (EQ (field, Qpqhost)) 848 else if (EQ (field, Qpqhost))
849 /* PQhost Returns the server host name of the connection. 849 /* PQhost Returns the server host name of the connection.
850 char *PQhost(PGconn *conn) 850 char *PQhost(PGconn *conn)
851 */ 851 */
852 return build_ext_string (PQhost(P), PG_OS_CODING); 852 return build_extstring (PQhost(P), PG_OS_CODING);
853 else if (EQ (field, Qpqport)) 853 else if (EQ (field, Qpqport))
854 { 854 {
855 char *p; 855 char *p;
856 /* PQport Returns the port of the connection. 856 /* PQport Returns the port of the connection.
857 char *PQport(PGconn *conn) 857 char *PQport(PGconn *conn)
863 } 863 }
864 else if (EQ (field, Qpqtty)) 864 else if (EQ (field, Qpqtty))
865 /* PQtty Returns the debug tty of the connection. 865 /* PQtty Returns the debug tty of the connection.
866 char *PQtty(PGconn *conn) 866 char *PQtty(PGconn *conn)
867 */ 867 */
868 return build_ext_string (PQtty(P), PG_OS_CODING); 868 return build_extstring (PQtty(P), PG_OS_CODING);
869 else if (EQ (field, Qpqoptions)) 869 else if (EQ (field, Qpqoptions))
870 /* PQoptions Returns the backend options used in the connection. 870 /* PQoptions Returns the backend options used in the connection.
871 char *PQoptions(PGconn *conn) 871 char *PQoptions(PGconn *conn)
872 */ 872 */
873 return build_ext_string (PQoptions(P), PG_OS_CODING); 873 return build_extstring (PQoptions(P), PG_OS_CODING);
874 else if (EQ (field, Qpqstatus)) 874 else if (EQ (field, Qpqstatus))
875 { 875 {
876 ConnStatusType cst; 876 ConnStatusType cst;
877 /* PQstatus Returns the status of the connection. The status can be 877 /* PQstatus Returns the status of the connection. The status can be
878 CONNECTION_OK or CONNECTION_BAD. 878 CONNECTION_OK or CONNECTION_BAD.
897 else if (EQ (field, Qpqerrormessage)) 897 else if (EQ (field, Qpqerrormessage))
898 /* PQerrorMessage Returns the error message most recently generated 898 /* PQerrorMessage Returns the error message most recently generated
899 by an operation on the connection. 899 by an operation on the connection.
900 char *PQerrorMessage(PGconn* conn); 900 char *PQerrorMessage(PGconn* conn);
901 */ 901 */
902 return build_ext_string (PQerrorMessage(P), PG_OS_CODING); 902 return build_extstring (PQerrorMessage(P), PG_OS_CODING);
903 else if (EQ (field, Qpqbackendpid)) 903 else if (EQ (field, Qpqbackendpid))
904 /* PQbackendPID Returns the process ID of the backend server handling 904 /* PQbackendPID Returns the process ID of the backend server handling
905 this connection. 905 this connection.
906 int PQbackendPID(PGconn *conn); 906 int PQbackendPID(PGconn *conn);
907 */ 907 */
1074 1074
1075 CHECK_PGRESULT (result); 1075 CHECK_PGRESULT (result);
1076 R = (XPGRESULT (result))->pgresult; 1076 R = (XPGRESULT (result))->pgresult;
1077 PUKE_IF_NULL (R); 1077 PUKE_IF_NULL (R);
1078 1078
1079 return build_ext_string (PQresStatus (PQresultStatus (R)), PG_OS_CODING); 1079 return build_extstring (PQresStatus (PQresultStatus (R)), PG_OS_CODING);
1080 } 1080 }
1081 1081
1082 /* Sundry PGresult accessor functions */ 1082 /* Sundry PGresult accessor functions */
1083 DEFUN ("pq-result-error-message", Fpq_result_error_message, 1, 1, 0, /* 1083 DEFUN ("pq-result-error-message", Fpq_result_error_message, 1, 1, 0, /*
1084 Return last message associated with the query. 1084 Return last message associated with the query.
1089 1089
1090 CHECK_PGRESULT (result); 1090 CHECK_PGRESULT (result);
1091 R = (XPGRESULT (result))->pgresult; 1091 R = (XPGRESULT (result))->pgresult;
1092 PUKE_IF_NULL (R); 1092 PUKE_IF_NULL (R);
1093 1093
1094 return build_ext_string (PQresultErrorMessage (R), PG_OS_CODING); 1094 return build_extstring (PQresultErrorMessage (R), PG_OS_CODING);
1095 } 1095 }
1096 1096
1097 DEFUN ("pq-ntuples", Fpq_ntuples, 1, 1, 0, /* 1097 DEFUN ("pq-ntuples", Fpq_ntuples, 1, 1, 0, /*
1098 Return the number of tuples (instances) in the query result. 1098 Return the number of tuples (instances) in the query result.
1099 */ 1099 */
1147 CHECK_PGRESULT (result); 1147 CHECK_PGRESULT (result);
1148 CHECK_INT (field_index); 1148 CHECK_INT (field_index);
1149 R = (XPGRESULT (result))->pgresult; 1149 R = (XPGRESULT (result))->pgresult;
1150 PUKE_IF_NULL (R); 1150 PUKE_IF_NULL (R);
1151 1151
1152 return build_ext_string (PQfname (R, XINT (field_index)), PG_OS_CODING); 1152 return build_extstring (PQfname (R, XINT (field_index)), PG_OS_CODING);
1153 } 1153 }
1154 1154
1155 DEFUN ("pq-fnumber", Fpq_fnumber, 2, 2, 0, /* 1155 DEFUN ("pq-fnumber", Fpq_fnumber, 2, 2, 0, /*
1156 Return the number of fields (attributes) in each tuple of the query result. 1156 Return the number of fields (attributes) in each tuple of the query result.
1157 */ 1157 */
1232 CHECK_INT (tup_num); 1232 CHECK_INT (tup_num);
1233 CHECK_INT (field_num); 1233 CHECK_INT (field_num);
1234 R = (XPGRESULT (result))->pgresult; 1234 R = (XPGRESULT (result))->pgresult;
1235 PUKE_IF_NULL (R); 1235 PUKE_IF_NULL (R);
1236 1236
1237 return build_ext_string (PQgetvalue (R, XINT (tup_num), XINT (field_num)), 1237 return build_extstring (PQgetvalue (R, XINT (tup_num), XINT (field_num)),
1238 PG_OS_CODING); 1238 PG_OS_CODING);
1239 } 1239 }
1240 1240
1241 DEFUN ("pq-get-length", Fpq_get_length, 3, 3, 0, /* 1241 DEFUN ("pq-get-length", Fpq_get_length, 3, 3, 0, /*
1242 Returns the length of a field value in bytes. 1242 Returns the length of a field value in bytes.
1282 1282
1283 CHECK_PGRESULT (result); 1283 CHECK_PGRESULT (result);
1284 R = (XPGRESULT (result))->pgresult; 1284 R = (XPGRESULT (result))->pgresult;
1285 PUKE_IF_NULL (R); 1285 PUKE_IF_NULL (R);
1286 1286
1287 return build_ext_string (PQcmdStatus (R), PG_OS_CODING); 1287 return build_extstring (PQcmdStatus (R), PG_OS_CODING);
1288 } 1288 }
1289 1289
1290 DEFUN ("pq-cmd-tuples", Fpq_cmd_tuples, 1, 1, 0, /* 1290 DEFUN ("pq-cmd-tuples", Fpq_cmd_tuples, 1, 1, 0, /*
1291 Returns the number of rows affected by the SQL command. 1291 Returns the number of rows affected by the SQL command.
1292 */ 1292 */
1296 1296
1297 CHECK_PGRESULT (result); 1297 CHECK_PGRESULT (result);
1298 R = (XPGRESULT (result))->pgresult; 1298 R = (XPGRESULT (result))->pgresult;
1299 PUKE_IF_NULL (R); 1299 PUKE_IF_NULL (R);
1300 1300
1301 return build_ext_string (PQcmdTuples (R), PG_OS_CODING); 1301 return build_extstring (PQcmdTuples (R), PG_OS_CODING);
1302 } 1302 }
1303 1303
1304 DEFUN ("pq-oid-value", Fpq_oid_value, 1, 1, 0, /* 1304 DEFUN ("pq-oid-value", Fpq_oid_value, 1, 1, 0, /*
1305 Returns the object id of the tuple inserted. 1305 Returns the object id of the tuple inserted.
1306 */ 1306 */
1390 return Qnil; 1390 return Qnil;
1391 else 1391 else
1392 { 1392 {
1393 Lisp_Object temp; 1393 Lisp_Object temp;
1394 1394
1395 temp = list2 (build_ext_string (PGN->relname, PG_OS_CODING), make_int (PGN->be_pid)); 1395 temp = list2 (build_extstring (PGN->relname, PG_OS_CODING), make_int (PGN->be_pid));
1396 free ((void *)PGN); 1396 free ((void *)PGN);
1397 return temp; 1397 return temp;
1398 } 1398 }
1399 } 1399 }
1400 1400
1504 P = (XPGCONN (conn))->pgconn; 1504 P = (XPGCONN (conn))->pgconn;
1505 CHECK_LIVE_CONNECTION (P); 1505 CHECK_LIVE_CONNECTION (P);
1506 1506
1507 ret = PQgetline (P, buffer, sizeof (buffer)); 1507 ret = PQgetline (P, buffer, sizeof (buffer));
1508 1508
1509 return Fcons (make_int (ret), build_ext_string (buffer, PG_OS_CODING)); 1509 return Fcons (make_int (ret), build_extstring (buffer, PG_OS_CODING));
1510 } 1510 }
1511 1511
1512 DEFUN ("pq-put-line", Fpq_put_line, 2, 2, 0, /* 1512 DEFUN ("pq-put-line", Fpq_put_line, 2, 2, 0, /*
1513 Send a line to the server in copy out operation. 1513 Send a line to the server in copy out operation.
1514 1514
1573 ret = PQgetlineAsync (P, buffer, sizeof (buffer)); 1573 ret = PQgetlineAsync (P, buffer, sizeof (buffer));
1574 1574
1575 if (ret == -1) return Qt; /* done! */ 1575 if (ret == -1) return Qt; /* done! */
1576 else if (!ret) return Qnil; /* no data yet */ 1576 else if (!ret) return Qnil; /* no data yet */
1577 else return Fcons (make_int (ret), 1577 else return Fcons (make_int (ret),
1578 make_ext_string ((Extbyte *) buffer, ret, PG_OS_CODING)); 1578 make_extstring ((Extbyte *) buffer, ret, PG_OS_CODING));
1579 } 1579 }
1580 1580
1581 DEFUN ("pq-put-nbytes", Fpq_put_nbytes, 2, 2, 0, /* 1581 DEFUN ("pq-put-nbytes", Fpq_put_nbytes, 2, 2, 0, /*
1582 Asynchronous copy out. 1582 Asynchronous copy out.
1583 */ 1583 */
1843 { 1843 {
1844 Ibyte *p; 1844 Ibyte *p;
1845 1845
1846 #define FROB(envvar, var) \ 1846 #define FROB(envvar, var) \
1847 if ((p = egetenv (envvar))) \ 1847 if ((p = egetenv (envvar))) \
1848 var = build_intstring (p); \ 1848 var = build_istring (p); \
1849 else \ 1849 else \
1850 var = Qnil 1850 var = Qnil
1851 1851
1852 if (initialized) 1852 if (initialized)
1853 { 1853 {