CVS update: /ccvs/src/
[email protected] 17 Mar 2005 17:15:22 -0000
| Newsgroups | gmane.comp.version-control.cvs.cvs |
|---|---|
| Message-ID | <[email protected]> |
User: mdb Date: 05/03/17 09:15:22 Modified: /ccvs/src/ ChangeLog, annotate.c, buffer.c, checkin.c, classify.c, client.c, fileattr.c, find_names.c, hash.c, kerberos4-client.c, lock.c, login.c, logmsg.c, main.c, modules.c, myndbm.c, no_diff.c, patch.c, rcs.c, rcscmds.c, remove.c, server.c, status.c, subr.c, tag.c, update.c, vers_ts.c, wrapper.c Log: * buffer.c (fd_buffer_shutdown): Replace (int *) 0 with NULL. * server.c (do_cvs_command): Ditto. * client.c (update_entries): Use xnmalloc. * checkin.c (Checkin): Replace (char *) 0 with NULL. * patch.c (patch_fileproc): Ditto. * update.c (update_fileproc): Ditto. * no_diff.c (No_Difference): Ditto. * patch.c (patch_fileproc): Ditto. * rcscmds.c (call_diff_setup, call_diff_add_arg): Ditto. * update.c (join_file): Replace (RCSCHECKOUTPROC)0 with NULL. * rcs.c (RCS_checkin, RCS_cmp_file, RCS_delete_revs) (RCS_delete_revs): Ditto. * rcscmds.c (RCS_merge, RCS_exec_rcsdiff): Ditto. * annotate.c, checkin.c, classify.c, fileattr.c, find_names.c, hash.c, lock.c, login.c, logmsg.c, main.c, modules.c, myndbm.c, no_diff.c, patch.c, rcs.c, rcscmds.c, remove.c, server.c, status.c, subr.c, tag.c, update.c, vers_ts.c: Avoid casting NULL. File Changes: Directory: /ccvs/src/ ===================== File [changed]: ChangeLog Url: https://ccvs.cvshome.org/source/browse/ccvs/src/ChangeLog?r1=1.3158&r2=1.3159 Delta lines: +24 -0 -------------------- --- ChangeLog 17 Mar 2005 15:42:12 -0000 1.3158 +++ ChangeLog 17 Mar 2005 17:15:19 -0000 1.3159 @@ -1,3 +1,27 @@ +2005-03-16 Mark D. Baushke <[email protected]> + + * buffer.c (fd_buffer_shutdown): Replace (int *) 0 with NULL. + * server.c (do_cvs_command): Ditto. + + * client.c (update_entries): Use xnmalloc. + + * checkin.c (Checkin): Replace (char *) 0 with NULL. + * patch.c (patch_fileproc): Ditto. + * update.c (update_fileproc): Ditto. + * no_diff.c (No_Difference): Ditto. + * patch.c (patch_fileproc): Ditto. + * rcscmds.c (call_diff_setup, call_diff_add_arg): Ditto. + + * update.c (join_file): Replace (RCSCHECKOUTPROC)0 with NULL. + * rcs.c (RCS_checkin, RCS_cmp_file, RCS_delete_revs) + (RCS_delete_revs): Ditto. + * rcscmds.c (RCS_merge, RCS_exec_rcsdiff): Ditto. + + * annotate.c, checkin.c, classify.c, fileattr.c, find_names.c, + hash.c, lock.c, login.c, logmsg.c, main.c, modules.c, myndbm.c, + no_diff.c, patch.c, rcs.c, rcscmds.c, remove.c, server.c, + status.c, subr.c, tag.c, update.c, vers_ts.c: Avoid casting NULL. + 2005-03-17 Derek Price <[email protected]> * client.c (call_in_directory): Put function call after var decls. File [changed]: annotate.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/annotate.c?r1=1.19&r2=1.20 Delta lines: +3 -4 ------------------- --- annotate.c 11 Mar 2005 18:20:05 -0000 1.19 +++ annotate.c 17 Mar 2005 17:15:19 -0000 1.20 @@ -140,15 +140,14 @@ for (i = 0; i < argc; i++) { err += do_module (db, argv[i], MISC, "Annotating", rannotate_proc, - (char *) NULL, 0, local, 0, 0, (char *) NULL); + NULL, 0, local, 0, 0, NULL); } close_module (db); } else { - err = rannotate_proc (argc + 1, argv - 1, (char *) NULL, - (char *) NULL, (char *) NULL, 0, local, (char *) NULL, - (char *) NULL); + err = rannotate_proc (argc + 1, argv - 1, NULL, NULL, NULL, 0, + local, NULL, NULL); } return err; File [changed]: buffer.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/buffer.c?r1=1.56&r2=1.57 Delta lines: +1 -1 ------------------- --- buffer.c 7 Mar 2005 19:05:12 -0000 1.56 +++ buffer.c 17 Mar 2005 17:15:19 -0000 1.57 @@ -2167,7 +2167,7 @@ int w; do - w = waitpid (fb->child_pid, (int *) 0, 0); + w = waitpid (fb->child_pid, NULL, 0); while (w == -1 && errno == EINTR); if (w == -1) error (1, errno, "waiting for process %d", fb->child_pid); File [changed]: checkin.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/checkin.c?r1=1.54&r2=1.55 Delta lines: +6 -7 ------------------- --- checkin.c 1 Feb 2005 22:20:06 -0000 1.54 +++ checkin.c 17 Mar 2005 17:15:19 -0000 1.55 @@ -91,9 +91,8 @@ { /* The existing file is incorrect. We need to check out the correct file contents. */ - if (RCS_checkout (finfo->rcs, finfo->file, rev, (char *) NULL, - options, RUN_TTY, (RCSCHECKOUTPROC) NULL, - (void *) NULL) != 0) + if (RCS_checkout (finfo->rcs, finfo->file, rev, NULL, + options, RUN_TTY, NULL, NULL) != 0) error (1, 0, "failed when checking out new copy of %s", finfo->fullname); xchmod (finfo->file, 1); @@ -114,7 +113,7 @@ if (strcmp (vers->options, "-V4") == 0) vers->options[0] = '\0'; Register (finfo->entries, finfo->file, vers->vn_rcs, vers->ts_user, - vers->options, vers->tag, vers->date, (char *) 0); + vers->options, vers->tag, vers->date, NULL); history_write (type, NULL, vers->vn_rcs, finfo->file, finfo->repository); @@ -165,10 +164,10 @@ if (set_time) /* Need to update the checked out file on the client side. */ server_updated (finfo, vers, SERVER_UPDATED, - (mode_t) -1, (unsigned char *) NULL, - (struct buffer *) NULL); + (mode_t) -1, NULL, NULL); else - server_checked_in (finfo->file, finfo->update_dir, finfo->repository); + server_checked_in (finfo->file, finfo->update_dir, + finfo->repository); } else #endif File [changed]: classify.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/classify.c?r1=1.33&r2=1.34 Delta lines: +1 -1 ------------------- --- classify.c 1 Feb 2005 22:20:06 -0000 1.33 +++ classify.c 17 Mar 2005 17:15:19 -0000 1.34 @@ -392,7 +392,7 @@ } /* free up the vers struct, or just return it */ - if (versp != (Vers_TS **) NULL) + if (versp != NULL) *versp = vers; else freevers_ts (&vers); File [changed]: client.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/client.c?r1=1.421&r2=1.422 Delta lines: +3 -3 ------------------- --- client.c 17 Mar 2005 15:42:12 -0000 1.421 +++ client.c 17 Mar 2005 17:15:19 -0000 1.422 @@ -1801,9 +1801,9 @@ if (patch_failed) { /* Save this file to retrieve later. */ - failed_patches = xrealloc (failed_patches, - ((failed_patches_count + 1) - * sizeof (char *))); + failed_patches = xnrealloc (failed_patches, + failed_patches_count + 1, + sizeof (char *)); failed_patches[failed_patches_count] = xstrdup (short_pathname); ++failed_patches_count; File [changed]: fileattr.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/fileattr.c?r1=1.34&r2=1.35 Delta lines: +1 -2 ------------------- --- fileattr.c 11 Mar 2005 18:20:05 -0000 1.34 +++ fileattr.c 17 Mar 2005 17:15:19 -0000 1.35 @@ -528,8 +528,7 @@ #endif /* SERVER_SUPPORT */ "p", "s", srepos, "r", "s", current_parsed_root->directory, - (char *)NULL - ); + NULL); if (!cmdline || !strlen (cmdline)) { File [changed]: find_names.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/find_names.c?r1=1.40&r2=1.41 Delta lines: +1 -1 ------------------- --- find_names.c 7 Mar 2005 20:15:58 -0000 1.40 +++ find_names.c 17 Mar 2005 17:15:19 -0000 1.41 @@ -148,7 +148,7 @@ { List *entries = (List *) closure; - Subdir_Register (entries, (char *) NULL, p->key); + Subdir_Register (entries, NULL, p->key); return 0; } File [changed]: hash.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/hash.c?r1=1.46&r2=1.47 Delta lines: +3 -3 ------------------- --- hash.c 16 Mar 2005 22:00:49 -0000 1.46 +++ hash.c 17 Mar 2005 17:15:19 -0000 1.47 @@ -61,9 +61,9 @@ /* get a list from the cache and clear it */ list = listcache; listcache = listcache->next; - list->next = (List *) NULL; + list->next = NULL; for (i = 0; i < HASHSIZE; i++) - list->hasharray[i] = (Node *) NULL; + list->hasharray[i] = NULL; } else { @@ -146,7 +146,7 @@ { Node *p; - if (nodecache != (Node *) NULL) + if (nodecache != NULL) { /* get one from the cache */ p = nodecache; File [changed]: kerberos4-client.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/kerberos4-client.c?r1=1.6&r2=1.7 Delta lines: +2 -4 ------------------- --- kerberos4-client.c 28 Feb 2005 07:48:21 -0000 1.6 +++ kerberos4-client.c 17 Mar 2005 17:15:19 -0000 1.7 @@ -104,10 +104,8 @@ struct buffer **from_server_p ) { *to_server_p = krb_encrypt_buffer_initialize (*to_server_p, 0, sched, - kblock, - (BUFMEMERRPROC) NULL); + kblock, NULL); *from_server_p = krb_encrypt_buffer_initialize (*from_server_p, 1, - sched, kblock, - (BUFMEMERRPROC) NULL); + sched, kblock, NULL); } File [changed]: lock.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/lock.c?r1=1.108&r2=1.109 Delta lines: +2 -2 ------------------- --- lock.c 16 Mar 2005 22:00:49 -0000 1.108 +++ lock.c 17 Mar 2005 17:15:19 -0000 1.109 @@ -901,7 +901,7 @@ } /* We only know how to do one list at a time */ - if (locklist != (List *) NULL) + if (locklist != NULL) { error (0, 0, "lock_list_promotably called while promotable locks set - Help!"); @@ -913,7 +913,7 @@ { /* try to lock everything on the list */ lock_error = L_OK; /* init for set_promotablelock_proc */ - lock_error_repos = (char *) NULL; /* init for set_promotablelock_proc */ + lock_error_repos = NULL; /* init for set_promotablelock_proc */ locklist = list; /* init for Lock_Cleanup */ if (lockers_name != NULL) free (lockers_name); File [changed]: login.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/login.c?r1=1.83&r2=1.84 Delta lines: +1 -1 ------------------- --- login.c 28 Feb 2005 07:40:06 -0000 1.83 +++ login.c 17 Mar 2005 17:15:19 -0000 1.84 @@ -60,7 +60,7 @@ right thing for a GUI is to just store the password in memory only)... */ error (1, 0, "could not find out home directory"); - return (char *) NULL; + return NULL; } passfile = strcat_filename_onto_homedir (homedir, CVS_PASSWORD_FILE); File [changed]: logmsg.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/logmsg.c?r1=1.92&r2=1.93 Delta lines: +5 -7 ------------------- --- logmsg.c 16 Mar 2005 22:07:46 -0000 1.92 +++ logmsg.c 17 Mar 2005 17:15:19 -0000 1.93 @@ -799,9 +799,8 @@ "p", "s", srepos, "r", "s", current_parsed_root->directory, "sVv", ",", changes, - logmsg_list_to_args_proc, (void *) NULL, - (char *)NULL - ); + logmsg_list_to_args_proc, NULL, + NULL); if (!cmdline || !strlen (cmdline)) { if (cmdline) free (cmdline); @@ -915,15 +914,14 @@ script, "c", "s", cvs_cmd_name, #ifdef SERVER_SUPPORT - "R", "s", referrer ? referrer->original - : "NONE", + "R", "s", referrer + ? referrer->original : "NONE", #endif /* SERVER_SUPPORT */ "p", "s", srepos, "r", "s", current_parsed_root->directory, "l", "s", vpd->fname, - (char *)NULL - ); + NULL); #ifdef SUPPORT_OLD_INFO_FMT_STRINGS if (newscript) free (newscript); File [changed]: main.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/main.c?r1=1.243&r2=1.244 Delta lines: +2 -2 ------------------- --- main.c 16 Mar 2005 22:00:49 -0000 1.243 +++ main.c 17 Mar 2005 17:15:19 -0000 1.244 @@ -838,8 +838,8 @@ /* Probably the need for this will go away at some point once we call fflush enough places (e.g. fflush (stdout) in cvs_outerr). */ - (void) setvbuf (stdout, (char *) NULL, _IONBF, 0); - (void) setvbuf (stderr, (char *) NULL, _IONBF, 0); + (void) setvbuf (stdout, NULL, _IONBF, 0); + (void) setvbuf (stderr, NULL, _IONBF, 0); #endif /* KLUDGE_FOR_WNT_TESTSUITE */ if (use_cvsrc) File [changed]: modules.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/modules.c?r1=1.93&r2=1.94 Delta lines: +3 -5 ------------------- --- modules.c 16 Mar 2005 22:07:46 -0000 1.93 +++ modules.c 17 Mar 2005 17:15:19 -0000 1.94 @@ -557,8 +557,7 @@ nullrepos = emptydir_name (); - Create_Admin (".", dir, - nullrepos, (char *) NULL, (char *) NULL, 0, 0, 1); + Create_Admin (".", dir, nullrepos, NULL, NULL, 0, 0, 1); if (!noexec) { FILE *fp; @@ -638,9 +637,8 @@ CVSMODULE_SPEC, mname); else err += my_module (db, spec_opt, m_type, msg, callback_proc, - (char *) NULL, 0, local_specified, - run_module_prog, build_dirs, extra_arg, - stack); + NULL, 0, local_specified, run_module_prog, + build_dirs, extra_arg, stack); spec_opt = next_opt; } File [changed]: myndbm.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/myndbm.c?r1=1.34&r2=1.35 Delta lines: +1 -1 ------------------- --- myndbm.c 1 Feb 2005 22:20:06 -0000 1.34 +++ myndbm.c 17 Mar 2005 17:15:19 -0000 1.35 @@ -161,7 +161,7 @@ } else { - key.dptr = (char *) NULL; + key.dptr = NULL; key.dsize = 0; } db->dbm_next = p->next; File [changed]: no_diff.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/no_diff.c?r1=1.37&r2=1.38 Delta lines: +2 -3 ------------------- --- no_diff.c 16 Mar 2005 22:07:46 -0000 1.37 +++ no_diff.c 17 Mar 2005 17:15:19 -0000 1.38 @@ -53,8 +53,7 @@ options = xstrdup (""); tocvsPath = wrap_tocvs_process_file (finfo->file); - retcode = RCS_cmp_file (vers->srcfile, vers->vn_user, (char **)NULL, - (char *)NULL, options, + retcode = RCS_cmp_file (vers->srcfile, vers->vn_user, NULL, NULL, options, tocvsPath == NULL ? finfo->file : tocvsPath); if (retcode == 0) { @@ -62,7 +61,7 @@ ts = time_stamp (finfo->file); Register (finfo->entries, finfo->file, vers->vn_user ? vers->vn_user : vers->vn_rcs, ts, - options, vers->tag, vers->date, (char *) 0); + options, vers->tag, vers->date, NULL); #ifdef SERVER_SUPPORT if (server_active) { File [changed]: patch.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/patch.c?r1=1.100&r2=1.101 Delta lines: +3 -3 ------------------- --- patch.c 16 Mar 2005 15:52:14 -0000 1.100 +++ patch.c 17 Mar 2005 17:15:19 -0000 1.101 @@ -257,7 +257,7 @@ db = open_module (); for (i = 0; i < argc; i++) err += do_module (db, argv[i], PATCH, "Patching", patch_proc, - (char *)NULL, 0, local, 0, 0, (char *)NULL); + NULL, 0, local, 0, 0, NULL); close_module (db); free (options); patch_cleanup (0); @@ -547,7 +547,7 @@ } memset ((char *) &t, 0, sizeof (t)); if ((t.actime = t.modtime = RCS_getrevtime (rcsfile, vers_tag, - (char *) 0, 0)) != -1) + NULL, 0)) != -1) /* I believe this timestamp only affects the dates in our diffs, and therefore should be on the server, not the client. */ (void)utime (tmpfile1, &t); @@ -569,7 +569,7 @@ goto out; } if ((t.actime = t.modtime = RCS_getrevtime (rcsfile, vers_head, - (char *)0, 0)) != -1) + NULL, 0)) != -1) /* I believe this timestamp only affects the dates in our diffs, and therefore should be on the server, not the client. */ (void)utime (tmpfile2, &t); File [changed]: rcs.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/rcs.c?r1=1.337&r2=1.338 Delta lines: +5 -5 ------------------- --- rcs.c 16 Mar 2005 22:07:46 -0000 1.337 +++ rcs.c 17 Mar 2005 17:15:19 -0000 1.338 @@ -2308,7 +2308,7 @@ if (symtag && STREQ (symtag, TAG_HEAD)) #if 0 /* This #if 0 is only in the Cygnus code. Why? Death support? */ if (force_tag_match && (rcs->flags & VALID) && (rcs->flags & INATTIC)) - return ((char *) NULL); /* head request for removed file */ + return NULL; /* head request for removed file */ else #endif return RCS_head (rcs); @@ -5414,7 +5414,7 @@ ? "-kb" : "-ko"), tmpfile, - (RCSCHECKOUTPROC)0, NULL); + NULL, NULL); if (status != 0) error (1, 0, "could not check out revision %s of `%s'", @@ -5677,7 +5677,7 @@ /* Open & cache rev1 */ tmpfile = cvs_temp_name(); if (RCS_checkout (rcs, NULL, rev1, NULL, options, tmpfile, - (RCSCHECKOUTPROC)0, NULL)) + NULL, NULL)) error (1, errno, "cannot check out revision %s of %s", rev1, rcs->print_path); @@ -6545,7 +6545,7 @@ afterfile = cvs_temp_name(); status = RCS_checkout (rcs, NULL, after, NULL, "-ko", afterfile, - (RCSCHECKOUTPROC)0, NULL); + NULL, NULL); if (status > 0) goto delrev_done; @@ -6573,7 +6573,7 @@ { beforefile = cvs_temp_name(); status = RCS_checkout (rcs, NULL, before, NULL, "-ko", beforefile, - (RCSCHECKOUTPROC)0, NULL); + NULL, NULL); if (status > 0) goto delrev_done; File [changed]: rcscmds.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/rcscmds.c?r1=1.67&r2=1.68 Delta lines: +9 -11 -------------------- --- rcscmds.c 16 Mar 2005 22:07:46 -0000 1.67 +++ rcscmds.c 17 Mar 2005 17:15:19 -0000 1.68 @@ -101,7 +101,7 @@ if (call_diff_argv[i]) { free (call_diff_argv[i]); - call_diff_argv[i] = (char *) 0; + call_diff_argv[i] = NULL; } } call_diff_argc = 0; @@ -111,7 +111,7 @@ /* put each word into call_diff_argv, allocating it as we go */ for (cp = strtok (call_diff_prog, " \t"); cp != NULL; - cp = strtok ((char *) NULL, " \t")) + cp = strtok (NULL, " \t")) call_diff_add_arg (cp); free (call_diff_prog); } @@ -138,7 +138,7 @@ call_diff_argv[call_diff_argc++] = xstrdup (s); else /* Not post-incremented on purpose! */ - call_diff_argv[call_diff_argc] = (char *) 0; + call_diff_argv[call_diff_argc] = NULL; } /* Callback function for the diff library to write data to the output @@ -194,8 +194,8 @@ static struct diff_callbacks call_diff_file_callbacks = { - (void (*) (const char *, size_t)) NULL, - (void (*) (void)) NULL, + NULL, + NULL, call_diff_write_stdout, call_diff_error }; @@ -262,8 +262,7 @@ cvs_output ("\n", 1); tmp1 = cvs_temp_name(); - if (RCS_checkout (rcs, NULL, xrev1, rev1, options, tmp1, - (RCSCHECKOUTPROC)0, NULL)) + if (RCS_checkout (rcs, NULL, xrev1, rev1, options, tmp1, NULL, NULL)) { cvs_outerr ("rcsmerge: co failed\n", 0); exit (EXIT_FAILURE); @@ -274,8 +273,7 @@ cvs_output ("\n", 1); tmp2 = cvs_temp_name(); - if (RCS_checkout (rcs, NULL, xrev2, rev2, options, tmp2, - (RCSCHECKOUTPROC)0, NULL)) + if (RCS_checkout (rcs, NULL, xrev2, rev2, options, tmp2, NULL, NULL)) { cvs_outerr ("rcsmerge: co failed\n", 0); exit (EXIT_FAILURE); @@ -405,7 +403,7 @@ { tmpfile1 = cvs_temp_name(); status = RCS_checkout (rcsfile, NULL, rev1, NULL, options, tmpfile1, - (RCSCHECKOUTPROC)0, NULL); + NULL, NULL); if (status > 0) { retval = status; @@ -433,7 +431,7 @@ cvs_output (rev2, 0); cvs_output ("\n", 1); status = RCS_checkout (rcsfile, NULL, rev2, NULL, options, - tmpfile2, (RCSCHECKOUTPROC)0, NULL); + tmpfile2, NULL, NULL); if (status > 0) { retval = status; File [changed]: remove.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/remove.c?r1=1.61&r2=1.62 Delta lines: +6 -10 -------------------- --- remove.c 16 Mar 2005 22:00:49 -0000 1.61 +++ remove.c 17 Mar 2005 17:15:19 -0000 1.62 @@ -90,11 +90,9 @@ { if (!noexec) { - start_recursion - ( remove_force_fileproc, (FILESDONEPROC) NULL, - (DIRENTPROC) NULL, (DIRLEAVEPROC) NULL, + start_recursion (remove_force_fileproc, NULL, NULL, NULL, NULL, argc, argv, local, W_LOCAL, - 0, CVS_LOCK_NONE, (char *) NULL, 0, (char *) NULL ); + 0, CVS_LOCK_NONE, NULL, 0, NULL); } /* else FIXME should probably act as if the file doesn't exist in doing the following checks. */ @@ -115,11 +113,9 @@ #endif /* start the recursion processor */ - err = start_recursion - ( remove_fileproc, (FILESDONEPROC) NULL, - remove_dirproc, (DIRLEAVEPROC) NULL, NULL, argc, argv, - local, W_LOCAL, 0, CVS_LOCK_READ, (char *) NULL, 1, - (char *) NULL ); + err = start_recursion (remove_fileproc, NULL, remove_dirproc, NULL, + NULL, argc, argv, local, W_LOCAL, 0, + CVS_LOCK_READ, NULL, 1, NULL); if (removed_files && !really_quiet) error (0, 0, "use `%s commit' to remove %s permanently", program_name, File [changed]: server.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/server.c?r1=1.423&r2=1.424 Delta lines: +4 -7 ------------------- --- server.c 16 Mar 2005 22:00:49 -0000 1.423 +++ server.c 17 Mar 2005 17:15:19 -0000 1.424 @@ -314,8 +314,7 @@ might need to change this later on to make sure that we only write one entry. */ - Subdir_Register ((List *) NULL, dir_where_cvsadm_lives, - dir_to_register); + Subdir_Register (NULL, dir_where_cvsadm_lives, dir_to_register); } if (done) @@ -2243,8 +2242,7 @@ "p", "s", ".", "r", "s", current_parsed_root->directory, "P", "s", config->PrimaryServer->original, - (char *)NULL - ); + NULL); if (!cmdline || !strlen (cmdline)) { @@ -4062,7 +4060,7 @@ while (command_pid > 0) { pid_t waited_pid; - waited_pid = waitpid (command_pid, (int *) 0, 0); + waited_pid = waitpid (command_pid, NULL, 0); if (waited_pid < 0 && errno == EINTR) continue; if (waited_pid == command_pid) @@ -5558,8 +5556,7 @@ for (i = 1; i < argument_count; i++) err += do_module (db, argument_vector[i], CHECKOUT, "Updating", expand_proc, - NULL, 0, 0, 0, 0, - (char *) NULL); + NULL, 0, 0, 0, 0, NULL); close_module (db); } File [changed]: status.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/status.c?r1=1.65&r2=1.66 Delta lines: +4 -6 ------------------- --- status.c 16 Mar 2005 22:00:49 -0000 1.65 +++ status.c 17 Mar 2005 17:15:19 -0000 1.66 @@ -107,10 +107,9 @@ #endif /* start the recursion processor */ - err = start_recursion - ( status_fileproc, (FILESDONEPROC) NULL, - status_dirproc, (DIRLEAVEPROC) NULL, NULL, argc, argv, local, - W_LOCAL, 0, CVS_LOCK_READ, (char *) NULL, 1, (char *) NULL); + err = start_recursion (status_fileproc, NULL, status_dirproc, + NULL, NULL, argc, argv, local, W_LOCAL, + 0, CVS_LOCK_READ, NULL, 1, NULL); return (err); } @@ -127,8 +126,7 @@ Vers_TS *vers; Node *node; - status = Classify_File (finfo, (char *) NULL, (char *) NULL, (char *) NULL, - 1, 0, &vers, 0); + status = Classify_File (finfo, NULL, NULL, NULL, 1, 0, &vers, 0); sstat = "Classify Error"; switch (status) { File [changed]: subr.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/subr.c?r1=1.138&r2=1.139 Delta lines: +3 -3 ------------------- --- subr.c 16 Mar 2005 22:00:50 -0000 1.138 +++ subr.c 17 Mar 2005 17:15:19 -0000 1.139 @@ -1050,13 +1050,13 @@ * EXAMPLE * (ignoring oldway variable and srepos since those are only around while we * SUPPORT_OLD_INFO_FMT_STRINGS) - * format_cmdline( "/cvsroot/CVSROOT/mytaginfoproc %t %o %{sVv}", + * format_cmdline ("/cvsroot/CVSROOT/mytaginfoproc %t %o %{sVv}", * "t", "s", "newtag", * "o", "s", "mov", * "xG", "ld", longintwhichwontbeusedthispass, * "sVv", ",", tlist, pretag_list_to_args_proc, * (void *) mydata, - * (char *)NULL); + * NULL); * * would generate the following command line, assuming two files in tlist, * file1 & file2, each with old versions 1.1 and new version 1.1.2.3: File [changed]: tag.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/tag.c?r1=1.135&r2=1.136 Delta lines: +28 -26 --------------------- --- tag.c 16 Mar 2005 19:14:20 -0000 1.135 +++ tag.c 17 Mar 2005 17:15:19 -0000 1.136 @@ -325,18 +325,19 @@ #endif /* SUPPORT_OLD_INFO_FMT_STRINGS */ filter, "t", "s", ppd->symtag, - "o", "s", ppd->delete_flag ? "del" : - ppd->force_tag_move ? "mov" : "add", - "b", "c", delete_flag ? '?' : branch_mode ? 'T' : 'N', + "o", "s", ppd->delete_flag + ? "del" : ppd->force_tag_move ? "mov" : "add", + "b", "c", delete_flag + ? '?' : branch_mode ? 'T' : 'N', "c", "s", cvs_cmd_name, #ifdef SERVER_SUPPORT "R", "s", referrer ? referrer->original : "NONE", #endif /* SERVER_SUPPORT */ "p", "s", srepos, "r", "s", current_parsed_root->directory, - "sVv", ",", ppd->tlist, pretag_list_to_args_proc, (void *)NULL, - (char *)NULL - ); + "sVv", ",", ppd->tlist, + pretag_list_to_args_proc, NULL, + NULL); if (!cmdline || !strlen (cmdline)) { @@ -757,16 +758,17 @@ "t", "s", ppd->symtag, "o", "s", ppd->delete_flag ? "del" : ppd->force_tag_move ? "mov" : "add", - "b", "c", delete_flag ? '?' : branch_mode ? 'T' : 'N', + "b", "c", delete_flag + ? '?' : branch_mode ? 'T' : 'N', "c", "s", cvs_cmd_name, #ifdef SERVER_SUPPORT "R", "s", referrer ? referrer->original : "NONE", #endif /* SERVER_SUPPORT */ "p", "s", srepos, "r", "s", current_parsed_root->directory, - "sVv", ",", ppd->tlist, pretag_list_to_args_proc, (void *) NULL, - (char *)NULL - ); + "sVv", ",", ppd->tlist, + pretag_list_to_args_proc, NULL, + NULL); if (newfilter) free (newfilter); File [changed]: update.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/update.c?r1=1.251&r2=1.252 Delta lines: +16 -21 --------------------- --- update.c 16 Mar 2005 22:07:46 -0000 1.251 +++ update.c 17 Mar 2005 17:15:19 -0000 1.252 @@ -110,7 +110,7 @@ static int patches = 0; static int rcs_diff_patches = 0; #endif -static List *ignlist = (List *) NULL; +static List *ignlist = NULL; static time_t last_register_time; static const char *const update_usage[] = { @@ -722,7 +722,7 @@ Register (finfo->entries, finfo->file, vers->vn_rcs, vers->ts_rcs, vers->options, vers->tag, - vers->date, (char *)0); + vers->date, NULL); } } if (!retval) @@ -748,7 +748,7 @@ ? SERVER_RCS_DIFF : SERVER_PATCHED), file_info.st_mode, checksum, - (struct buffer *) NULL); + NULL); break; } } @@ -1458,7 +1458,7 @@ if (update_server && server_active) server_updated (finfo, vers_ts, merging ? SERVER_MERGED : SERVER_UPDATED, - mode, (unsigned char *) NULL, revbuf); + mode, NULL, revbuf); #endif } else @@ -1634,7 +1634,7 @@ * At least, if we are keeping track of the tag vn_user came from, * I don't know where yet. -DRP */ - retcode = RCS_checkout (vers_ts->srcfile, (char *) NULL, + retcode = RCS_checkout (vers_ts->srcfile, NULL, vers_ts->vn_user, vers_ts->tag, vers_ts->options, RUN_TTY, patch_file_write, (void *) &data); @@ -1657,7 +1657,7 @@ data.compute_checksum = 1; md5_init_ctx (&data.context); - retcode = RCS_checkout (vers_ts->srcfile, (char *) NULL, + retcode = RCS_checkout (vers_ts->srcfile, NULL, vers_ts->vn_rcs, vers_ts->tag, vers_ts->options, RUN_TTY, patch_file_write, (void *) &data); @@ -2011,9 +2011,7 @@ { server_copy_file (finfo->file, finfo->update_dir, finfo->repository, backup); - server_updated (finfo, vers, SERVER_MERGED, - (mode_t) -1, (unsigned char *) NULL, - (struct buffer *) NULL); + server_updated (finfo, vers, SERVER_MERGED, (mode_t) -1, NULL, NULL); } #endif @@ -2122,14 +2120,14 @@ below about vn_user. */ /* Convert the second revision, walking branches and dates. */ - rev2 = RCS_getversion (vers->srcfile, jrev2, jdate2, 1, (int *) NULL); + rev2 = RCS_getversion (vers->srcfile, jrev2, jdate2, 1, NULL); /* If this is a merge of two revisions, get the first revision. If only one join tag was specified, then the first revision is the greatest common ancestor of the second revision and the working file. */ if (jrev1 != NULL) - rev1 = RCS_getversion (vers->srcfile, jrev1, jdate1, 1, (int *) NULL); + rev1 = RCS_getversion (vers->srcfile, jrev1, jdate1, 1, NULL); else { /* Note that we use vn_rcs here, since vn_user may contain a @@ -2279,7 +2277,7 @@ { server_scratch (finfo->file); server_updated (finfo, vers, SERVER_UPDATED, (mode_t) -1, - (unsigned char *) NULL, (struct buffer *) NULL); + NULL, NULL); } #endif Register (finfo->entries, finfo->file, mrev, vers->ts_rcs, @@ -2420,8 +2418,7 @@ */ retcode = RCS_checkout (vers->srcfile, finfo->file, vers->vn_user, vers->tag, - (char *) NULL, RUN_TTY, - (RCSCHECKOUTPROC) NULL, (void *) NULL); + NULL, RUN_TTY, NULL, NULL); if (retcode != 0) error (1, 0, "failed to check out %s file", finfo->fullname); @@ -2482,8 +2479,8 @@ * Also, it is safe to pass in NULL for nametag since we know no * substitution is happening during the binary mode checkout. */ - if (RCS_checkout ( finfo->rcs, finfo->file, rev2, (char *)NULL, t_options, - RUN_TTY, (RCSCHECKOUTPROC)0, NULL) != 0 ) + if (RCS_checkout (finfo->rcs, finfo->file, rev2, NULL, t_options, + RUN_TTY, NULL, NULL) != 0) status = 2; else status = 0; @@ -2517,8 +2514,8 @@ the two files, and let them resolve it. It is possible that we should require a "touch foo" or similar step before we allow a checkin. */ - if (RCS_checkout ( finfo->rcs, finfo->file, rev2, (char *)NULL, - t_options, RUN_TTY, (RCSCHECKOUTPROC)0, NULL) != 0) + if (RCS_checkout (finfo->rcs, finfo->file, rev2, NULL, + t_options, RUN_TTY, NULL, NULL) != 0) status = 2; else status = 0; @@ -2614,9 +2611,7 @@ { server_copy_file (finfo->file, finfo->update_dir, finfo->repository, backup); - server_updated (finfo, vers, SERVER_MERGED, - (mode_t) -1, (unsigned char *) NULL, - (struct buffer *) NULL); + server_updated (finfo, vers, SERVER_MERGED, (mode_t) -1, NULL, NULL); } #endif File [changed]: vers_ts.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/vers_ts.c?r1=1.61&r2=1.62 Delta lines: +2 -2 ------------------- --- vers_ts.c 1 Feb 2005 22:20:07 -0000 1.61 +++ vers_ts.c 17 Mar 2005 17:15:20 -0000 1.62 @@ -259,7 +259,7 @@ } /* get user file time-stamp in ts_user */ - if (finfo->entries != (List *) NULL) + if (finfo->entries != NULL) { #ifdef SERVER_SUPPORT if (server_active) @@ -445,5 +445,5 @@ if ((*versp)->ts_conflict) free ((*versp)->ts_conflict); free ((char *) *versp); - *versp = (Vers_TS *) NULL; + *versp = NULL; } File [changed]: wrapper.c Url: https://ccvs.cvshome.org/source/browse/ccvs/src/wrapper.c?r1=1.42&r2=1.43 Delta lines: +1 -1 ------------------- --- wrapper.c 16 Mar 2005 22:00:50 -0000 1.42 +++ wrapper.c 17 Mar 2005 17:15:20 -0000 1.43 @@ -503,7 +503,7 @@ for(x=0;x<count;++x) if (CVS_FNMATCH (wrap_list[x]->wildCard, name, 0) == 0) return wrap_list[x]; - return (WrapperEntry *)NULL; + return NULL; } /* Return the RCS options for FILENAME in a newly malloc'd string. If